NEW started refactoring unit tests