refactoring tesing classes