Fixing more unittests