Definitely need a unit test that covers this filtering logic completely.