Minor cleanup of test.