fixed some unittests