added countryinfo tests, changed to chai expect
Merge branch 'add_tests'