Improve on filter setup and testcases