Refactoring.
Adjust test.