diff --git a/SolarTests/CorrectResults.json b/SolarTests/CorrectResults.json
index 5975f26..785604c 100644
--- a/SolarTests/CorrectResults.json
+++ b/SolarTests/CorrectResults.json
@@ -95,7 +95,7 @@
     "sunrise": "2017-02-09T02:37:03+00:00",
     "sunset": "2017-02-09T12:19:47+00:00"
  }, {
-    "city": "Asunci??n",
+    "city": "Asunción",
     "latitude": -25.30066,
     "longitude": -57.63591,
     "sunrise": "2017-02-09T09:33:08+00:00",
@@ -215,13 +215,13 @@
     "sunrise": "2017-02-09T07:25:13+00:00",
     "sunset": "2017-02-09T19:07:50+00:00"
  }, {
-    "city": "Bogot?�",
+    "city": "Bogotá",
     "latitude": 4.60971,
     "longitude": -74.08175,
     "sunrise": "2017-02-09T11:11:42+00:00",
     "sunset": "2017-02-09T23:09:21+00:00"
  }, {
-    "city": "Bras??lia",
+    "city": "Brasília",
     "latitude": -15.77972,
     "longitude": -47.92972,
     "sunrise": "2017-02-09T09:05:42+00:00",
@@ -251,7 +251,7 @@
     "sunrise": "2017-02-09T07:04:15+00:00",
     "sunset": "2017-02-09T16:49:21+00:00"
  }, {
-    "city": "Bucure�?ti",
+    "city": "București",
     "latitude": 44.43225,
     "longitude": 26.10626,
     "sunrise": "2017-02-09T05:22:54+00:00",
@@ -311,7 +311,7 @@
     "sunrise": "2017-02-09T10:49:35+00:00",
     "sunset": "2017-02-09T22:18:16+00:00"
  }, {
-    "city": "Chi�?in��u",
+    "city": "Chișinău",
     "latitude": 47.00556,
     "longitude": 28.8575,
     "sunrise": "2017-02-09T05:17:15+00:00",
@@ -467,13 +467,13 @@
     "sunrise": "2017-02-09T10:40:46+00:00",
     "sunset": "2017-02-09T22:10:26+00:00"
  }, {
-    "city": "H?� N��?i",
+    "city": "Hà Nội",
     "latitude": 21.0245,
     "longitude": 105.84117,
     "sunrise": "2017-02-08T23:29:46+00:00",
     "sunset": "2017-02-09T10:51:53+00:00"
  }, {
-    "city": "Hag?�t?�a",
+    "city": "Hagåtña",
     "latitude": 13.47417,
     "longitude": 144.74778,
     "sunrise": "2017-02-08T20:45:46+00:00",
@@ -515,7 +515,7 @@
     "sunrise": "2017-02-08T19:20:58+00:00",
     "sunset": "2017-02-09T07:47:49+00:00"
  }, {
-    "city": "Isl��m��b��d",
+    "city": "Islāmābād",
     "latitude": 33.72148,
     "longitude": 73.04329,
     "sunrise": "2017-02-09T01:57:15+00:00",
@@ -641,7 +641,7 @@
     "sunrise": "2017-02-09T06:12:34+00:00",
     "sunset": "2017-02-09T16:19:47+00:00"
  }, {
-    "city": "Lom??",
+    "city": "Lomé",
     "latitude": 6.13748,
     "longitude": 1.21227,
     "sunrise": "2017-02-09T06:12:07+00:00",
@@ -749,7 +749,7 @@
     "sunrise": "2017-02-09T03:47:04+00:00",
     "sunset": "2017-02-09T17:01:28+00:00"
  }, {
-    "city": "Mat?�'utu",
+    "city": "Matā'utu",
     "latitude": -13.28163,
     "longitude": -176.17453,
     "sunrise": "2017-02-09T17:41:35+00:00",
@@ -869,7 +869,7 @@
     "sunrise": "2017-02-09T07:33:27+00:00",
     "sunset": "2017-02-09T19:02:32+00:00"
  }, {
-    "city": "Noum??a",
+    "city": "Nouméa",
     "latitude": -22.27631,
     "longitude": 166.4572,
     "sunrise": "2017-02-08T18:40:11+00:00",
@@ -923,7 +923,7 @@
     "sunrise": "2017-02-08T19:45:11+00:00",
     "sunset": "2017-02-09T07:37:54+00:00"
  }, {
-    "city": "Panam?�",
+    "city": "Panamá",
     "latitude": 8.9936,
     "longitude": -79.51973,
     "sunrise": "2017-02-09T11:37:57+00:00",
@@ -989,7 +989,7 @@
     "sunrise": "2017-02-09T11:19:25+00:00",
     "sunset": "2017-02-09T22:47:40+00:00"
  }, {
-    "city": "Port-aux-Fran??ais",
+    "city": "Port-aux-Français",
     "latitude": -49.35,
     "longitude": 70.21667,
     "sunrise": "2017-02-09T00:17:56+00:00",
@@ -1055,7 +1055,7 @@
     "sunrise": "2017-02-09T07:16:59+00:00",
     "sunset": "2017-02-09T18:06:04+00:00"
  }, {
-    "city": "Reykjav??k",
+    "city": "Reykjavík",
     "latitude": 64.13548,
     "longitude": -21.89541,
     "sunrise": "2017-02-09T09:39:38+00:00",
@@ -1091,7 +1091,7 @@
     "sunrise": "2017-02-09T10:32:05+00:00",
     "sunset": "2017-02-09T22:07:25+00:00"
  }, {
-    "city": "S?�o Tom??",
+    "city": "São Tomé",
     "latitude": 0.33654,
     "longitude": 6.72732,
     "sunrise": "2017-02-09T05:44:06+00:00",
@@ -1109,7 +1109,7 @@
     "sunrise": "2017-02-09T07:25:54+00:00",
     "sunset": "2017-02-09T17:19:17+00:00"
  }, {
-    "city": "Saint John�??s",
+    "city": "Saint John’s",
     "latitude": 17.11667,
     "longitude": -61.85,
     "sunrise": "2017-02-09T10:35:55+00:00",
@@ -1133,7 +1133,7 @@
     "sunrise": "2017-02-09T10:56:29+00:00",
     "sunset": "2017-02-09T21:01:16+00:00"
  }, {
-    "city": "San Jos??",
+    "city": "San José",
     "latitude": 9.93333,
     "longitude": -84.08333,
     "sunrise": "2017-02-09T11:57:10+00:00",
@@ -1229,7 +1229,7 @@
     "sunrise": "2017-02-08T17:57:14+00:00",
     "sunset": "2017-02-09T06:43:37+00:00"
  }, {
-    "city": "T??rshavn",
+    "city": "Tórshavn",
     "latitude": 62.00973,
     "longitude": -6.77164,
     "sunrise": "2017-02-09T08:27:53+00:00",
@@ -1271,7 +1271,7 @@
     "sunrise": "2017-02-09T12:14:02+00:00",
     "sunset": "2017-02-09T23:52:02+00:00"
  }, {
-    "city": "Tehr��n",
+    "city": "Tehrān",
     "latitude": 35.69439,
     "longitude": 51.42151,
     "sunrise": "2017-02-09T03:26:37+00:00",
@@ -1403,7 +1403,7 @@
     "sunrise": "2017-02-09T06:38:47+00:00",
     "sunset": "2017-02-09T18:31:52+00:00"
  }, {
-    "city": "Yaound??",
+    "city": "Yaoundé",
     "latitude": 3.86667,
     "longitude": 11.51667,
     "sunrise": "2017-02-09T05:28:34+00:00",