Refactored Filter methods and Int-tests