Merge "Fix broken unit tests:"