registry: add more test coverage, sort UnitStates