Updating init_country and adding tests