Add country tests
Add more unit testing