Updated test coverage for some queries/filters