QueryScenarioFor tests

- Right up to the givens