unit tests cleanup