Fix tests
Fix filters bug