Fix test for override_only
Don't return a Country object for a null or empty string

Fixes #47