Use correct fixtures in tests and make required changes so tests pass.

Now every fake query does not need to be listed in the code, a fixture
just needs to be added.