Re-factors filtering tests.
Adds switch case fallthrough comments.