QA: Reorder test code
Un-generify filter()