fix country queries and tests

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
v1.2.1