Move where and order into QueryMethods; one failed test