Review country to mcc mapping and fix a number of them.

Also added consistency test between country and operator mappings.