fix query tests with defaults