cleanup more tests