fixed all the unittests