diff --git a/server/lib/python/cartodb_services/test/test_cartodb_services_geocoder.py b/server/lib/python/cartodb_services/test/test_cartodb_services_geocoder.py
index 044dca0..4670fe6 100644
--- a/server/lib/python/cartodb_services/test/test_cartodb_services_geocoder.py
+++ b/server/lib/python/cartodb_services/test/test_cartodb_services_geocoder.py
@@ -4,31 +4,64 @@
 from unittest import TestCase
 from mock import Mock, MagicMock
 from nose.tools import assert_not_equal, assert_equal, assert_true
-from cartodb_services.geocoder import run_street_point_geocoder
+from cartodb_services.geocoder import run_street_point_geocoder, StreetGeocoderSearch
 
 
 class TestRunStreetPointGeocoder(TestCase):
-    def test_count_increment_total_and_failed_service_use_on_error(self):
-        quota_service_mock = Mock()
 
-        service_manager_mock = Mock()
-        service_manager_mock.quota_service = quota_service_mock
-        service_manager_mock.assert_within_limits = \
+    def setUp(self):
+        point = [0,0]
+        self.plpy_mock = Mock()
+        self.plpy_mock.execute = MagicMock(return_value=[{'the_geom': point}])
+
+        self.logger_config_mock = MagicMock(min_log_level='debug',
+                                            log_file_path='/tmp/ptest.log')
+        self.gd_mock = {'logger_config': self.logger_config_mock}
+
+        self.geocoder_mock = Mock()
+
+        self.quota_service_mock = Mock()
+
+        self.service_manager_mock = Mock()
+        self.service_manager_mock.quota_service = self.quota_service_mock
+        self.service_manager_mock.assert_within_limits = MagicMock()
+
+    def test_count_increment_total_and_failed_service_use_on_error(self):
+        self.service_manager_mock.assert_within_limits = \
             Mock(side_effect=Exception('Fail!'))
 
         searches = []
 
-        logger_config_mock = MagicMock(min_log_level='debug',
-                                       log_file_path='/tmp/ptest.log')
         with(self.assertRaises(BaseException)):
-            run_street_point_geocoder(Mock(),
-                                      {'logger_config': logger_config_mock},
-                                      None,
-                                      service_manager_mock,
-                                      None, None, searches)
+            run_street_point_geocoder(self.plpy_mock, self.gd_mock,
+                                      self.geocoder_mock,
+                                      self.service_manager_mock,
+                                      'any_username', None, searches)
 
-        quota_service_mock.increment_total_service_use. \
+        self.quota_service_mock.increment_total_service_use. \
             assert_called_once_with(len(searches))
 
-        quota_service_mock.increment_failed_service_use. \
+        self.quota_service_mock.increment_failed_service_use. \
             assert_called_once_with(len(searches))
+
+    def test_increment_success_service_use_on_complete_response(self):
+        searches = [
+            StreetGeocoderSearch(id=1, address='Paseo Zorrilla 1, Valladolid',
+                                 city=None, state=None, country=None),
+            StreetGeocoderSearch(id=2, address='Paseo Zorrilla 2, Valladolid',
+                                 city=None, state=None, country=None)
+        ]
+        results = [
+            (1, [0, 0], {}),
+            (2, [0, 0], {}),
+        ]
+        self.geocoder_mock.bulk_geocode = MagicMock(return_value=results)
+        run_street_point_geocoder(self.plpy_mock, self.gd_mock,
+                                  self.geocoder_mock,
+                                  self.service_manager_mock,
+                                  'any_username', None, searches)
+
+        self.quota_service_mock.increment_success_service_use.\
+            assert_called_once_with(len(results))
+
+