remove global
removed redundant namespacing from country data
tests