Refactoring UnitTests