Refactor Filter test to new model.