some tests cleanup