Fix broken test for filter columns.
We only have binary predicates, so the value is not optional.
Increase code coverage.
Improve code coverage by not using the switch-case.
Improve code coverage.
Improve code coverage further.