Merge "Fix broken unit test."