Remove references to collection filter & fix tests