finished conversion of unittests