Add test for Queries.
Update tests.