Fix issue #0490.
Refactoring.
Rename tests.