Adds INDEX-SYNONYM-COUNTRY to country index
Improves regression tests