Merge "Refactor inputfilter tests"