Added more tests with top-level fields filtering