Fix comparing a country to a non-country object
Pull the country tests over from active_utils

Add a test for country comparisons

Closes #1331.