More internal conversions to own dog's food...
MapMessageSourceTest: reintroduce a @Test removed by mistake...