Implemented filter method, updated unit tests