Updating a few more things with i18n.
A scattering of tests.