Merge "Fix broken tests."