refactor other methods into Query as well
fix projecttest and hopefully all css tester tests