Clean up unit test slightly.