- tests cleanup, added utils