Improved boolean filter spec
Wrote choice filter spec