Fixing unittests