note: only two of the tests actually needed migrating, as the others were already covered (e.g. by lang) Change-Id: I30abb2bd728ae2b144ad76566096a216aed3b8f8
