fixing unittests