Make filtering classes optional
Update tests to test if classes are filtered