fixing tests, filter> and remove> still fail