Filter stuff
Fixed tests