changed the test and removed fixed queries