Takes msgid as keya. Fix tests.