Most tests pass, still need extentions and country code