Cleanup test.
Minor cleanup.