Fix unit tests
Also import South Sudan #2698