Fixing Unittests.