Merge "Fix unit test breakage"