Simplify filter test
Simplify tests