fixed unittests