Merge "Fixing broken unittests."