QueryScenarioFor tests

- Some more testz is all I can say