Merge "Merge "test for Filter.java" into dev fix error in "testTaskPresenter.java"" into dev