Implementing the class filters for higher testability