Fixed #XXX - Rewrote filter tests as unit tests.