Clean up the test cases for subquery