more tests cleanup