One more test cleanup.