Fixed tests and removed filter code