Merge "Add tests to assert filter validation"