Introducing Filter classes
Filter test cases part 2