The first of many MRs to make an attempt to have a test suite that can run successfully in any locale.
