minor unit test cleanup