Fixing more unittests.