Fix tests

Fix some of the unit tests. Needs review in case I misread changes in CLDR.