Revert modification of test data

This should not have been changed. It was wrong because population was
missing for regions
Sort geoname by name to have predictable results