fixed remaining (failed) unittests