Merge "Fix 3 broken unittests."