Improving test readability.
Minor adjustments in unit tests.