Basic query decompositions and test cleanup.
Releasing control after pushing to the stack causes client death?