more cleanup before testing