Merge "test for Filter.java" into dev