refactoring and refactoring of unit tests