- Refactored unit test code.