refactoring, adding test filters