More cleanup for EventTypeTest
Improved DefaultFilterTest