refactoring UnitTests