fix unittests & unitsync