filter fixes
Filter tests
More tests