Refined tests.
Refactored tests.