Clean up tests for filtering