Xin, since github was down I put test review comments in this TestSubQueries.java.

Please ignore other changes (from master).
Please do not merge this branch.