Removed unnecessary filter and test abstract classes