* fixed unittests