refactored some names of tests, removed an inheritance