Update tests to use new populate class for countries.