Clean + add basic test for filter