More unit test cleanup