Unit test refactoring.