Refactored AndFilter and OrFilter, added CompositeFilter and tests for OrFilter