Change test messages.
Code refactoring.