Problem is that subquery execution can't be called during prepare/optimize phase.

Also small fix for subquery test suite.