More work on getting the stub Query test implemented and failing without something throwing an exception (due to unit test setup, not Query or other issues.)