fixed remaining unit tests