Fix test.
Refactoring.