unit test cleanup phase 1