cleanup in tests and some more of them