fixed the unittests