Refactor test_filters
Merge pull request #88 from AndreiH/refactor_filter

Refactor test_filters