more unit test cleanup