More unit test cleanup.