Fixed #23958 - Rewrote filter tests as unit tests.

e.g.