MDL-43246 fix up unit tests failures.