Refactoring.
Refactoring test code.