diff --git a/tests/test_geo.py b/tests/test_geo.py
index 498636f..b2634c3 100755
--- a/tests/test_geo.py
+++ b/tests/test_geo.py
@@ -23,11 +23,12 @@ def wipeRedis():
     serv_redis_db.flushall()
 
 def errorExit():
-    wipeRedis()
     sys.exit(1)
 
 def test():
+    flag_error = False
     today = datetime.datetime.now()
+
     # IP -> Coord
     supposed_ip = '8.8.8.8'
     geo_helper.getCoordFromIpAndPublish(supposed_ip, categ)
@@ -35,27 +36,27 @@ def test():
     excpected_result = [['{"lat": 37.751, "lon": -97.822}', 1.0]]
     if rep != excpected_result:
         print('ip to coord result not matching')
-        errorExit()
+        flag_error = True
 
     # gethitmap
     rep = geo_helper.getHitMap(today)
     excpected_result = [['US', 1.0]]
     if rep != excpected_result:
         print('getHitMap result not matching')
-        errorExit()
+        flag_error = True
 
     # getCoordsByRadius
     rep = geo_helper.getCoordsByRadius(today, today, 0.000, 0.000, '1')
     excpected_result = []
     if rep != excpected_result:
         print('getCoordsByRadius result not matching')
-        errorExit()
+        flag_error = True
 
     rep = geo_helper.getCoordsByRadius(today, today, 37.750, -97.821, '10')
     excpected_result = [[['{"categ": "Network Activity", "value": "8.8.8.8"}'], [-97.82200008630753, 37.75100012475438]]]
     if rep != excpected_result:
         print('getCoordsByRadius result not matching')
-        errorExit()
+        flag_error = True
 
     wipeRedis()
     
@@ -67,9 +68,12 @@ def test():
     excpected_result = ['{"lat": "49.7500", "lon": "6.1667"}', 1.0]
     if rep != excpected_result:
         print('Phone to coord result not matching')
-        errorExit()
+        flag_error = True
 
-
-test()
 wipeRedis()
-print('Tests succeeded')
+if test():
+    wipeRedis()
+    errorExit()
+else:
+    wipeRedis()
+    print('Geo tests succeeded')
diff --git a/tests/test_trendings.py b/tests/test_trendings.py
index 80f9cca..4cce0e7 100755
--- a/tests/test_trendings.py
+++ b/tests/test_trendings.py
@@ -25,7 +25,7 @@ def errorExit():
     sys.exit(1)
 
 def test():
-    flag_error = True
+    flag_error = False
     today = datetime.datetime.now()
     now = time.time
 
@@ -39,7 +39,7 @@ def test():
     rep = trendings_helper.getTrendingEvents(today, today)
     if rep[0][1] != expected_result[0][1]: #ignore timestamps
         print('getTrendingEvents result not matching')
-        flag_error = False
+        flag_error = True
 
     # Tags
     tag1 = {'id': 'tag1', 'colour': 'blue', 'name': 'tag1Name'}
@@ -51,7 +51,7 @@ def test():
     rep = trendings_helper.getTrendingTags(today, today)
     if rep[0][1] != expected_result[0][1]: #ignore timestamps
         print('getTrendingTags result not matching')
-        flag_error = False
+        flag_error = True
 
     # Sightings
     trendings_helper.addSightings(now())
@@ -61,14 +61,14 @@ def test():
     rep = trendings_helper.getTrendingSightings(today, today)
     if rep[0][1] != expected_result[0][1]: #ignore timestamps
         print('getTrendingSightings result not matching')
-        flag_error = False
+        flag_error = True
     
     return flag_error
 
 wipeRedis()
 if test():
     wipeRedis()
-    print('Trendings tests succeeded')
+    errorExit()
 else:
     wipeRedis()
-    errorExit()
+    print('Trendings tests succeeded')