more cleanup for tests