Unit Tests refactoring