Refactoring & testing QueryFilter, Collections