Re #10681 Fixed unit tests fixed locally a while ago.