Test case refactoring.
Test case cleanup.