Refactored ChoiceFilter test
Callback, Choice and Date
Finished refactoring tests