6 files changed, 12 insertions, 14 deletions
diff --git a/test/service/cookiesSpec.js b/test/service/cookiesSpec.js
index 66bdc504..d73923a6 100644
--- a/test/service/cookiesSpec.js
+++ b/test/service/cookiesSpec.js
@@ -3,7 +3,7 @@
 describe('$cookies', function() {
   beforeEach(inject(function($provide) {
     $provide.factory('$browser', function(){
-      return angular.extend(new MockBrowser(), {cookieHash: {preexisting:'oldCookie'}}); 
+      return angular.extend(new angular.mock.$Browser(), {cookieHash: {preexisting:'oldCookie'}});
     });
   }));
 
diff --git a/test/service/exceptionHandlerSpec.js b/test/service/exceptionHandlerSpec.js
index 821ad7b8..00abff30 100644
--- a/test/service/exceptionHandlerSpec.js
+++ b/test/service/exceptionHandlerSpec.js
@@ -5,11 +5,9 @@ describe('$exceptionHandler', function() {
 
   it('should log errors', inject(
     function($provide){
-      $provide.factory('$exceptionHandler', $exceptionHandlerFactory);
-      $provide.value('$log', $logMock);
+      $provide.service('$exceptionHandler', $ExceptionHandlerProvider);
     },
     function($log, $exceptionHandler) {
-      $log.error.rethrow = false;
       $exceptionHandler('myError');
       expect($log.error.logs.shift()).toEqual(['myError']);
     }
diff --git a/test/service/localeSpec.js b/test/service/localeSpec.js
index 86bc7b0e..83c4ecee 100644
--- a/test/service/localeSpec.js
+++ b/test/service/localeSpec.js
@@ -2,7 +2,7 @@
 
 describe('$locale', function() {
 
-  var $locale = angular.service('$locale')();
+  var $locale = new $LocaleProvider().$get();
 
   it('should have locale id set to en-us', function() {
     expect($locale.id).toBe('en-us');
diff --git a/test/service/logSpec.js b/test/service/logSpec.js
index 3b860756..93e705a9 100644
--- a/test/service/logSpec.js
+++ b/test/service/logSpec.js
@@ -12,7 +12,7 @@ describe('$log', function() {
   beforeEach(inject(function($provide){
     $window = {};
     logger = '';
-    $provide.factory('$log', $logFactory);
+    $provide.service('$log', $LogProvider);
     $provide.value('$exceptionHandler', rethrow);
     $provide.value('$window', $window);
   }));
@@ -68,7 +68,7 @@ describe('$log', function() {
       e.line = undefined;
       e.stack = undefined;
 
-      $log = $logFactory({console:{error:function() {
+      $log = new $LogProvider().$get[1]({console:{error:function() {
         errorArgs = arguments;
       }}});
     });
diff --git a/test/service/scopeSpec.js b/test/service/scopeSpec.js
index b7f50edb..88824fcd 100644
--- a/test/service/scopeSpec.js
+++ b/test/service/scopeSpec.js
@@ -2,8 +2,8 @@
 
 describe('Scope', function() {
 
-  beforeEach(inject(function($provide) {
-    $provide.factory('$exceptionHandler', $exceptionHandlerMockFactory);
+  beforeEach(inject(function($exceptionHandlerProvider) {
+    $exceptionHandlerProvider.mode('log');
   }));
 
 
@@ -121,12 +121,12 @@ describe('Scope', function() {
       expect(spy).wasCalled();
     }));
 
-    it('should delegate exceptions', inject(function($rootScope, $exceptionHandler) {
+    it('should delegate exceptions', inject(function($rootScope, $exceptionHandler, $log) {
       $rootScope.$watch('a', function() {throw new Error('abc');});
       $rootScope.a = 1;
       $rootScope.$digest();
       expect($exceptionHandler.errors[0].message).toEqual('abc');
-      $logMock.error.logs.length = 0;
+      $log.assertEmpty();
     }));
 
 
@@ -422,7 +422,7 @@ describe('Scope', function() {
     }));
 
 
-    it('should catch exceptions', inject(function($rootScope, $exceptionHandler) {
+    it('should catch exceptions', inject(function($rootScope, $exceptionHandler, $log) {
       var log = '';
       var child = $rootScope.$new();
       $rootScope.$watch('a', function(scope, a){ log += '1'; });
@@ -430,7 +430,7 @@ describe('Scope', function() {
       child.$apply(function() { throw new Error('MyError'); });
       expect(log).toEqual('1');
       expect($exceptionHandler.errors[0].message).toEqual('MyError');
-      $logMock.error.logs.shift();
+      $log.error.logs.shift();
     }));
 
 
diff --git a/test/service/snifferSpec.js b/test/service/snifferSpec.js
index 72c32046..7ec1dc8d 100644
--- a/test/service/snifferSpec.js
+++ b/test/service/snifferSpec.js
@@ -3,7 +3,7 @@
 describe('$sniffer', function() {
 
   function sniffer($window) {
-    return angular.service('$sniffer')($window);
+    return new $SnifferProvider().$get[1]($window);
   }
 
   describe('history', function() {