Merge "Refactor CountryDetectorServiceTest"