#8: fixed remaining unit tests