class tests cleanup