some unit test cleanup