unit test; more cleanup