Moving code into base, moving query_tests into browser_tests.
Update # of expected queries.