Re #10708 One more unit test for changes which seems sort thing out