diff --git a/angularFiles.js b/angularFiles.js
index 29b8d62a67af..35f302cee0d5 100755
--- a/angularFiles.js
+++ b/angularFiles.js
@@ -175,6 +175,7 @@ var angularFiles = {
     'test/auto/*.js',
     'test/ng/**/*.js',
     'test/ngAnimate/*.js',
+    'test/ngMessageFormat/*.js',
     'test/ngMessages/*.js',
     'test/ngCookies/*.js',
     'test/ngResource/*.js',
@@ -212,7 +213,9 @@ var angularFiles = {
     'test/modules/no_bootstrap.js',
     'src/ngScenario/browserTrigger.js',
     'test/helpers/*.js',
+    'test/ngAnimate/*.js',
     'test/ngMessageFormat/*.js',
+    'test/ngMessages/*.js',
     'test/ngMock/*.js',
     'test/ngCookies/*.js',
     'test/ngRoute/**/*.js',
diff --git a/test/helpers/matchers.js b/test/helpers/matchers.js
index 5d12f4f7de4f..ec8cc436acb6 100644
--- a/test/helpers/matchers.js
+++ b/test/helpers/matchers.js
@@ -233,6 +233,11 @@ beforeEach(function() {
         compare: generateCompare(false),
         negativeCompare: generateCompare(true)
       };
+      function hasClass(element, selector) {
+        if (!element.getAttribute) return false;
+        return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " ").
+            indexOf(" " + selector + " ") > -1);
+      }
       function generateCompare(isNot) {
         return function(actual, clazz) {
           var message = function() {
@@ -240,7 +245,7 @@ beforeEach(function() {
           };
           var classes = clazz.trim().split(/\s+/);
           for (var i = 0; i < classes.length; ++i) {
-            if (!jqLiteHasClass(actual[0], classes[i])) {
+            if (!hasClass(actual[0], classes[i])) {
               return { pass: isNot };
             }
           }
diff --git a/test/ngAnimate/animateCssSpec.js b/test/ngAnimate/animateCssSpec.js
index 8f3869d624f6..b9ae98d0c3d8 100644
--- a/test/ngAnimate/animateCssSpec.js
+++ b/test/ngAnimate/animateCssSpec.js
@@ -56,9 +56,9 @@ describe("ngAnimate $animateCss", function() {
     inject(function($animateCss, $sniffer, $rootElement, $document) {
 
     var animator;
-    var element = jqLite('<div></div>');
+    var element = angular.element('<div></div>');
     $rootElement.append(element);
-    jqLite($document[0].body).append($rootElement);
+    angular.element($document[0].body).append($rootElement);
 
     $sniffer.transitions = $sniffer.animations = false;
     animator = $animateCss(element, {
@@ -76,9 +76,9 @@ describe("ngAnimate $animateCss", function() {
 
       $animate.enabled(false);
 
-      var animator, element = jqLite('<div></div>');
+      var animator, element = angular.element('<div></div>');
       $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+      angular.element($document[0].body).append($rootElement);
 
       animator = $animateCss(element, {
         duration: 10,
@@ -91,7 +91,7 @@ describe("ngAnimate $animateCss", function() {
     it("should silently quit the animation and not throw when an element has no parent during preparation",
       inject(function($animateCss, $rootScope, $document, $rootElement) {
 
-      var element = jqLite('<div></div>');
+      var element = angular.element('<div></div>');
       expect(function() {
         $animateCss(element, {
           duration: 1000,
@@ -108,8 +108,8 @@ describe("ngAnimate $animateCss", function() {
     it("should silently quit the animation and not throw when an element has no parent before starting",
       inject(function($animateCss, $$rAF, $rootScope, $document, $rootElement) {
 
-      var element = jqLite('<div></div>');
-      jqLite($document[0].body).append($rootElement);
+      var element = angular.element('<div></div>');
+      angular.element($document[0].body).append($rootElement);
       $rootElement.append(element);
 
       $animateCss(element, {
@@ -129,12 +129,12 @@ describe("ngAnimate $animateCss", function() {
       it("should buffer all requests into a single requestAnimationFrame call",
         inject(function($animateCss, $$rAF, $rootScope, $document, $rootElement) {
 
-        jqLite($document[0].body).append($rootElement);
+        angular.element($document[0].body).append($rootElement);
 
         var count = 0;
         var runners = [];
         function makeRequest() {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
           var runner = $animateCss(element, { duration: 5, to: fakeStyle }).start();
           runner.then(function() {
@@ -168,10 +168,10 @@ describe("ngAnimate $animateCss", function() {
           });
         });
         inject(function($animateCss, $$rAF, $document, $rootElement) {
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           function makeRequest() {
-            var element = jqLite('<div></div>');
+            var element = angular.element('<div></div>');
             $rootElement.append(element);
             $animateCss(element, { duration: 5, to: fakeStyle }).start();
           }
@@ -188,9 +188,9 @@ describe("ngAnimate $animateCss", function() {
       var animationDuration = 5;
       var element, animator;
       beforeEach(inject(function($animateCss, $rootElement, $document) {
-        element = jqLite('<div></div>');
+        element = angular.element('<div></div>');
         $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+        angular.element($document[0].body).append($rootElement);
 
         animator = $animateCss(element, {
           event: 'enter',
@@ -374,9 +374,9 @@ describe("ngAnimate $animateCss", function() {
         }
 
         beforeEach(inject(function($rootElement, $document) {
-          element = jqLite('<div></div>');
+          element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
           options = { event: 'enter', structural: true };
         }));
 
@@ -648,7 +648,7 @@ describe("ngAnimate $animateCss", function() {
         it("should apply a stagger based when an active ng-EVENT-stagger class with a transition-delay is detected",
           inject(function($animateCss, $document, $rootElement, $timeout) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.ng-enter-stagger', 'transition-delay:0.2s');
           ss.addRule('.ng-enter', 'transition:2s linear all');
@@ -658,7 +658,7 @@ describe("ngAnimate $animateCss", function() {
           var elm;
 
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             elements.push(elm);
             $rootElement.append(elm);
 
@@ -689,7 +689,7 @@ describe("ngAnimate $animateCss", function() {
         it("should apply a stagger based when for all provided addClass/removeClass CSS classes",
           inject(function($animateCss, $document, $rootElement, $timeout) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.red-add-stagger,' +
                      '.blue-remove-stagger,' +
@@ -704,7 +704,7 @@ describe("ngAnimate $animateCss", function() {
           var elm;
 
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div class="blue"></div>');
+            elm = angular.element('<div class="blue"></div>');
             elements.push(elm);
             $rootElement.append(elm);
 
@@ -759,7 +759,7 @@ describe("ngAnimate $animateCss", function() {
         it("should block the transition animation between start and animate when staggered",
           inject(function($animateCss, $document, $rootElement) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.ng-enter-stagger', 'transition-delay:0.2s');
           ss.addRule('.ng-enter', 'transition:2s linear all;');
@@ -769,7 +769,7 @@ describe("ngAnimate $animateCss", function() {
           var elms = [];
 
           for (i = 0; i < 5; i++) {
-            element = jqLite('<div class="transition-animation"></div>');
+            element = angular.element('<div class="transition-animation"></div>');
             $rootElement.append(element);
 
             $animateCss(element, { event: 'enter', structural: true }).start();
@@ -790,14 +790,14 @@ describe("ngAnimate $animateCss", function() {
         it("should block (pause) the keyframe animation between start and animate when staggered",
           inject(function($animateCss, $document, $rootElement) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addPossiblyPrefixedRule('.ng-enter-stagger', 'animation-delay:0.2s');
           ss.addPossiblyPrefixedRule('.ng-enter', 'animation:my_animation 2s;');
 
           var i, element, elements = [];
           for (i = 0; i < 5; i++) {
-            element = jqLite('<div class="transition-animation"></div>');
+            element = angular.element('<div class="transition-animation"></div>');
             $rootElement.append(element);
 
             $animateCss(element, { event: 'enter', structural: true }).start();
@@ -819,12 +819,12 @@ describe("ngAnimate $animateCss", function() {
         it("should not apply a stagger if the transition delay value is inherited from a earlier CSS class",
           inject(function($animateCss, $document, $rootElement) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.transition-animation', 'transition:2s 5s linear all;');
 
           for (var i = 0; i < 5; i++) {
-            var element = jqLite('<div class="transition-animation"></div>');
+            var element = angular.element('<div class="transition-animation"></div>');
             $rootElement.append(element);
 
             $animateCss(element, { event: 'enter', structural: true }).start();
@@ -838,7 +838,7 @@ describe("ngAnimate $animateCss", function() {
         it("should apply a stagger only if the transition duration value is zero when inherited from a earlier CSS class",
           inject(function($animateCss, $document, $rootElement) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.transition-animation', 'transition:2s 5s linear all;');
           ss.addRule('.transition-animation.ng-enter-stagger',
@@ -846,7 +846,7 @@ describe("ngAnimate $animateCss", function() {
 
           var element, i, elms = [];
           for (i = 0; i < 5; i++) {
-            element = jqLite('<div class="transition-animation"></div>');
+            element = angular.element('<div class="transition-animation"></div>');
             $rootElement.append(element);
 
             elms.push(element);
@@ -864,13 +864,13 @@ describe("ngAnimate $animateCss", function() {
         it("should ignore animation staggers if only transition animations were detected",
           inject(function($animateCss, $document, $rootElement) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.ng-enter-stagger', prefix + 'animation-delay:0.2s');
           ss.addRule('.transition-animation', 'transition:2s 5s linear all;');
 
           for (var i = 0; i < 5; i++) {
-            var element = jqLite('<div class="transition-animation"></div>');
+            var element = angular.element('<div class="transition-animation"></div>');
             $rootElement.append(element);
 
             $animateCss(element, { event: 'enter', structural: true }).start();
@@ -884,13 +884,13 @@ describe("ngAnimate $animateCss", function() {
         it("should ignore transition staggers if only keyframe animations were detected",
           inject(function($animateCss, $document, $rootElement) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.ng-enter-stagger', 'transition-delay:0.2s');
           ss.addPossiblyPrefixedRule('.transition-animation', 'animation: 2s 5s my_animation;');
 
           for (var i = 0; i < 5; i++) {
-            var elm = jqLite('<div class="transition-animation"></div>');
+            var elm = angular.element('<div class="transition-animation"></div>');
             $rootElement.append(elm);
 
             var animator = $animateCss(elm, { event: 'enter', structural: true }).start();
@@ -904,7 +904,7 @@ describe("ngAnimate $animateCss", function() {
         it("should start on the highest stagger value if both transition and keyframe staggers are used together",
           inject(function($animateCss, $document, $rootElement, $timeout, $browser) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addPossiblyPrefixedRule('.ng-enter-stagger', 'transition-delay: 0.5s; ' +
                                                           'animation-delay: 1s');
@@ -914,7 +914,7 @@ describe("ngAnimate $animateCss", function() {
 
           var i, elm, elements = [];
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             elements.push(elm);
             $rootElement.append(elm);
 
@@ -942,14 +942,14 @@ describe("ngAnimate $animateCss", function() {
         it("should apply the closing timeout ontop of the stagger timeout",
           inject(function($animateCss, $document, $rootElement, $timeout, $browser) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.ng-enter-stagger', 'transition-delay:1s;');
           ss.addRule('.ng-enter', 'transition:10s linear all;');
 
           var elm, i, elms = [];
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             elms.push(elm);
             $rootElement.append(elm);
 
@@ -969,14 +969,14 @@ describe("ngAnimate $animateCss", function() {
         it("should apply the closing timeout ontop of the stagger timeout with an added delay",
           inject(function($animateCss, $document, $rootElement, $timeout, $browser) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.ng-enter-stagger', 'transition-delay:1s;');
           ss.addRule('.ng-enter', 'transition:10s linear all; transition-delay:50s;');
 
           var elm, i, elms = [];
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             elms.push(elm);
             $rootElement.append(elm);
 
@@ -996,12 +996,12 @@ describe("ngAnimate $animateCss", function() {
         it("should issue a stagger if a stagger value is provided in the options",
           inject(function($animateCss, $document, $rootElement, $timeout) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
           ss.addRule('.ng-enter', 'transition:2s linear all');
 
           var elm, i, elements = [];
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             elements.push(elm);
             $rootElement.append(elm);
 
@@ -1035,9 +1035,9 @@ describe("ngAnimate $animateCss", function() {
         it("should only add/remove classes once the stagger timeout has passed",
           inject(function($animateCss, $document, $rootElement, $timeout) {
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
-          var element = jqLite('<div class="green"></div>');
+          var element = angular.element('<div class="green"></div>');
           $rootElement.append(element);
 
           $animateCss(element, {
@@ -1064,9 +1064,9 @@ describe("ngAnimate $animateCss", function() {
 
           ss.addRule('.ng-enter', 'transition:10s linear all;');
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var animator = $animateCss(element, { event: 'enter', structural: true });
           animator.start();
@@ -1087,9 +1087,9 @@ describe("ngAnimate $animateCss", function() {
 
           ss.addRule('.ng-enter', 'transition:10s linear all; transition-delay:30s;');
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var animator = $animateCss(element, { event: 'enter', structural: true });
           animator.start();
@@ -1110,9 +1110,9 @@ describe("ngAnimate $animateCss", function() {
 
           ss.addRule('.ng-enter', 'transition:10s linear all;');
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var animator = $animateCss(element, { event: 'enter', structural: true });
 
@@ -1135,9 +1135,9 @@ describe("ngAnimate $animateCss", function() {
 
           ss.addRule('.ng-enter', 'transition:10s linear all;');
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var animator = $animateCss(element, { event: 'enter', structural: true });
 
@@ -1183,9 +1183,9 @@ describe("ngAnimate $animateCss", function() {
           ss.addRule('.elm.blue', 'transition:2s linear all; background:blue;');
           ss.addRule('.elm.green', 'background:green;');
 
-          var element = jqLite('<div class="elm"></div>');
+          var element = angular.element('<div class="elm"></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           // timeout will be at 1500s
           animate(element, 'red', doneSpy);
@@ -1228,9 +1228,9 @@ describe("ngAnimate $animateCss", function() {
         it("should not throw an error any pending timeout requests resolve after the element has already been removed",
           inject(function($animateCss, $document, $rootElement, $timeout, $animate) {
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.red', 'transition:1s linear all;');
 
@@ -1246,9 +1246,9 @@ describe("ngAnimate $animateCss", function() {
         it("should consider a positive options.delay value for the closing timeout",
           inject(function($animateCss, $rootElement, $timeout, $document) {
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var options = {
             delay: 3,
@@ -1279,9 +1279,9 @@ describe("ngAnimate $animateCss", function() {
         it("should ignore a boolean options.delay value for the closing timeout",
           inject(function($animateCss, $rootElement, $timeout, $document) {
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var options = {
             delay: true,
@@ -1315,9 +1315,9 @@ describe("ngAnimate $animateCss", function() {
 
           ss.addRule('.ng-enter', 'transition:10s linear all;');
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var animator = $animateCss(element, { event: 'enter', structural: true });
           animator.start();
@@ -1344,7 +1344,7 @@ describe("ngAnimate $animateCss", function() {
         beforeEach(module(function($provide) {
           count = {};
           $provide.value('$window', extend({}, window, {
-            document: jqLite(window.document),
+            document: angular.element(window.document),
             getComputedStyle: function(node) {
               var key = node.className.indexOf('stagger') >= 0
                   ? 'stagger' : 'normal';
@@ -1355,7 +1355,7 @@ describe("ngAnimate $animateCss", function() {
           }));
 
           return function($document, $rootElement) {
-            jqLite($document[0].body).append($rootElement);
+            angular.element($document[0].body).append($rootElement);
           };
         }));
 
@@ -1364,7 +1364,7 @@ describe("ngAnimate $animateCss", function() {
 
           var i, elm, animator;
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             $rootElement.append(elm);
             animator = $animateCss(elm, { event: 'enter', structural: true });
             var runner = animator.start();
@@ -1373,7 +1373,7 @@ describe("ngAnimate $animateCss", function() {
           expect(count.normal).toBe(1);
 
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             $rootElement.append(elm);
             animator = $animateCss(elm, { event: 'enter', structural: true });
             animator.start();
@@ -1385,7 +1385,7 @@ describe("ngAnimate $animateCss", function() {
           expect(count.normal).toBe(2);
 
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             $rootElement.append(elm);
             animator = $animateCss(elm, { event: 'enter', structural: true });
             animator.start();
@@ -1397,7 +1397,7 @@ describe("ngAnimate $animateCss", function() {
         it("should cache frequent calls to getComputedStyle for stagger animations before the next animation frame kicks in",
           inject(function($animateCss, $document, $rootElement, $$rAF) {
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
           var animator = $animateCss(element, { event: 'enter', structural: true });
           animator.start();
@@ -1407,7 +1407,7 @@ describe("ngAnimate $animateCss", function() {
 
           var i, elm;
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             $rootElement.append(elm);
             animator = $animateCss(elm, { event: 'enter', structural: true });
             animator.start();
@@ -1416,7 +1416,7 @@ describe("ngAnimate $animateCss", function() {
           expect(count.stagger).toBe(1);
 
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             $rootElement.append(elm);
             animator = $animateCss(elm, { event: 'enter', structural: true });
             animator.start();
@@ -1426,7 +1426,7 @@ describe("ngAnimate $animateCss", function() {
           $$rAF.flush();
 
           for (i = 0; i < 5; i++) {
-            elm = jqLite('<div></div>');
+            elm = angular.element('<div></div>');
             $rootElement.append(elm);
             animator = $animateCss(elm, { event: 'enter', structural: true });
             animator.start();
@@ -1455,9 +1455,9 @@ describe("ngAnimate $animateCss", function() {
         }
 
         beforeEach(inject(function($rootElement, $document) {
-          element = jqLite('<div></div>');
+          element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           elementOnSpy = spyOn(element, 'on').and.callThrough();
           elementOffSpy = spyOn(element, 'off').and.callThrough();
@@ -1586,9 +1586,9 @@ describe("ngAnimate $animateCss", function() {
         triggerAnimationStartFrame();
       }
 
-      var element = jqLite('<div></div>');
+      var element = angular.element('<div></div>');
       $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+      angular.element($document[0].body).append($rootElement);
 
       startAnimation(element, 0.5, 'red');
       expect(element.attr('style')).toContain('transition');
@@ -1609,13 +1609,13 @@ describe("ngAnimate $animateCss", function() {
 
     it("should clear cache if no animation so follow-up animation on the same element will not be from cache",
       inject(function($animateCss, $rootElement, $document, $$rAF) {
-        var element = jqLite('<div class="rclass"></div>');
+        var element = angular.element('<div class="rclass"></div>');
         var options = {
           event: 'enter',
           structural: true
         };
         $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+        angular.element($document[0].body).append($rootElement);
         var animator = $animateCss(element, options);
         expect(animator.$$willAnimate).toBeFalsy();
 
@@ -1629,9 +1629,9 @@ describe("ngAnimate $animateCss", function() {
     it('should apply a custom temporary class when a non-structural animation is used',
       inject(function($animateCss, $rootElement, $document) {
 
-      var element = jqLite('<div></div>');
+      var element = angular.element('<div></div>');
       $rootElement.append(element);
-      jqLite($document[0].body).append($rootElement);
+      angular.element($document[0].body).append($rootElement);
 
       $animateCss(element, {
         event: 'super',
@@ -1648,9 +1648,9 @@ describe("ngAnimate $animateCss", function() {
       they('should decorate the element with the ng-$prop CSS class',
         ['enter', 'leave', 'move'], function(event) {
         inject(function($animateCss, $rootElement, $document) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           $animateCss(element, {
             event: event,
@@ -1665,9 +1665,9 @@ describe("ngAnimate $animateCss", function() {
       they('should decorate the element with the ng-$prop-active CSS class',
         ['enter', 'leave', 'move'], function(event) {
         inject(function($animateCss, $rootElement, $document) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var animator = $animateCss(element, {
             event: event,
@@ -1686,9 +1686,9 @@ describe("ngAnimate $animateCss", function() {
       they('should remove the ng-$prop and ng-$prop-active CSS classes from the element once the animation is done',
         ['enter', 'leave', 'move'], function(event) {
         inject(function($animateCss, $rootElement, $document) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var animator = $animateCss(element, {
             event: event,
@@ -1712,7 +1712,7 @@ describe("ngAnimate $animateCss", function() {
       they('should allow additional CSS classes to be added and removed alongside the $prop animation',
         ['enter', 'leave', 'move'], function(event) {
         inject(function($animateCss, $rootElement) {
-          var element = jqLite('<div class="green"></div>');
+          var element = angular.element('<div class="green"></div>');
           $rootElement.append(element);
           var animator = $animateCss(element, {
             event: event,
@@ -1743,9 +1743,9 @@ describe("ngAnimate $animateCss", function() {
         ['enter', 'leave', 'move', 'addClass', 'removeClass'], function(event) {
 
         inject(function($animateCss, $rootElement, $document) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.cool-animation', 'transition:1.5s linear all;');
           element.addClass('cool-animation');
@@ -1773,9 +1773,9 @@ describe("ngAnimate $animateCss", function() {
         ['enter', 'leave', 'move', 'addClass', 'removeClass'], function(event) {
 
         inject(function($animateCss, $rootElement, $document, $window) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.cool-animation', 'transition:1.5s linear all;');
           element.addClass('cool-animation');
@@ -1814,9 +1814,9 @@ describe("ngAnimate $animateCss", function() {
         ['enter', 'leave', 'move', 'addClass', 'removeClass'], function(event) {
 
         inject(function($animateCss, $rootElement, $document) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           ss.addRule('.cool-animation', 'transition:1.5s linear all;');
           element.addClass('cool-animation');
@@ -1849,9 +1849,9 @@ describe("ngAnimate $animateCss", function() {
       it('should allow multiple events to be animated at the same time',
         inject(function($animateCss, $rootElement, $document) {
 
-        var element = jqLite('<div></div>');
+        var element = angular.element('<div></div>');
         $rootElement.append(element);
-        jqLite($document[0].body).append($rootElement);
+        angular.element($document[0].body).append($rootElement);
 
         $animateCss(element, {
           event: ['enter', 'leave', 'move'],
@@ -1883,10 +1883,10 @@ describe("ngAnimate $animateCss", function() {
 
       it('should not break when running anchored animations without duration',
         inject(function($animate, $document, $rootElement) {
-          var element1 = jqLite('<div class="item" ng-animate-ref="test">Item 1</div>');
-          var element2 = jqLite('<div class="item" ng-animate-ref="test">Item 2</div>');
+          var element1 = angular.element('<div class="item" ng-animate-ref="test">Item 1</div>');
+          var element2 = angular.element('<div class="item" ng-animate-ref="test">Item 2</div>');
 
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
           $rootElement.append(element1);
 
           expect($rootElement.text()).toBe('Item 1');
@@ -1904,7 +1904,7 @@ describe("ngAnimate $animateCss", function() {
       they('should decorate the element with the class-$prop CSS class',
         ['add', 'remove'], function(event) {
         inject(function($animateCss, $rootElement) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
 
           var options = {};
@@ -1919,7 +1919,7 @@ describe("ngAnimate $animateCss", function() {
       they('should decorate the element with the class-$prop-active CSS class',
         ['add', 'remove'], function(event) {
         inject(function($animateCss, $rootElement) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
 
           var options = {};
@@ -1938,9 +1938,9 @@ describe("ngAnimate $animateCss", function() {
       they('should remove the class-$prop-add and class-$prop-active CSS classes from the element once the animation is done',
         ['enter', 'leave', 'move'], function(event) {
         inject(function($animateCss, $rootElement, $document) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var options = {};
           options.event = event;
@@ -1964,7 +1964,7 @@ describe("ngAnimate $animateCss", function() {
         ['add', 'remove'], function(event) {
         inject(function($animateCss, $rootElement, $document) {
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
 
           if (event == 'add') {
             ss.addRule('.natural-class', 'transition:1s linear all;');
@@ -1977,7 +1977,7 @@ describe("ngAnimate $animateCss", function() {
           }
 
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var options = {};
           options[event + 'Class'] = 'natural-class';
@@ -2002,9 +2002,9 @@ describe("ngAnimate $animateCss", function() {
 
           ss.addRule('.blue.ng-' + event, 'transition:2s linear all;');
 
-          var element = jqLite('<div class="red"></div>');
+          var element = angular.element('<div class="red"></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
           var runner = $animateCss(element, {
             addClass: 'blue',
@@ -2040,9 +2040,9 @@ describe("ngAnimate $animateCss", function() {
       var element;
       beforeEach(module(function() {
         return function($rootElement, $document) {
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
 
-          element = jqLite('<div></div>');
+          element = angular.element('<div></div>');
           $rootElement.append(element);
         };
       }));
@@ -2141,7 +2141,7 @@ describe("ngAnimate $animateCss", function() {
 
       describe("[duration]", function() {
         it("should be applied for a transition directly", inject(function($animateCss, $rootElement) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
 
           var options = {
@@ -2269,7 +2269,7 @@ describe("ngAnimate $animateCss", function() {
 
       describe("[delay]", function() {
         it("should be applied for a transition directly", inject(function($animateCss, $rootElement) {
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
 
           var options = {
@@ -2291,7 +2291,7 @@ describe("ngAnimate $animateCss", function() {
         it("should return false for the animator if a delay is provided but not a duration",
           inject(function($animateCss, $rootElement) {
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
 
           var options = {
@@ -2313,7 +2313,7 @@ describe("ngAnimate $animateCss", function() {
                                   '-webkit-transition-delay:10s;' +
                                           'transition-delay:10s;');
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
 
           var options = {
@@ -2338,7 +2338,7 @@ describe("ngAnimate $animateCss", function() {
                                   '-webkit-transition-delay:10s;' +
                                           'transition-delay:10s;');
 
-          var element = jqLite('<div></div>');
+          var element = angular.element('<div></div>');
           $rootElement.append(element);
 
           var options = {
@@ -3044,9 +3044,9 @@ describe("ngAnimate $animateCss", function() {
 
         var element;
         beforeEach(inject(function($document, $rootElement) {
-          element = jqLite('<div></div>');
+          element = angular.element('<div></div>');
           $rootElement.append(element);
-          jqLite($document[0].body).append($rootElement);
+          angular.element($document[0].body).append($rootElement);
         }));
 
         it("should apply easing to a transition animation if it exists", inject(function($animateCss) {
@@ -3185,7 +3185,7 @@ describe("ngAnimate $animateCss", function() {
                                  '<circle cx="15" cy="5" r="100" fill="orange" />' +
                                '</svg>')($rootScope);
 
-        jqLite($document[0].body).append($rootElement);
+        angular.element($document[0].body).append($rootElement);
         $rootElement.append(element);
 
         $animateCss(element, {
@@ -3196,17 +3196,17 @@ describe("ngAnimate $animateCss", function() {
 
         triggerAnimationStartFrame();
 
-        expect(jqLiteHasClass(element[0], 'ng-enter')).toBe(true);
-        expect(jqLiteHasClass(element[0], 'ng-enter-active')).toBe(true);
+        expect(element).toHaveClass('ng-enter');
+        expect(element).toHaveClass('ng-enter-active');
 
         browserTrigger(element, 'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 10 });
 
-        expect(jqLiteHasClass(element[0], 'ng-enter')).toBe(false);
-        expect(jqLiteHasClass(element[0], 'ng-enter-active')).toBe(false);
+        expect(element).not.toHaveClass('ng-enter');
+        expect(element).not.toHaveClass('ng-enter-active');
       }));
 
       it('should properly remove classes from SVG elements', inject(function($animateCss) {
-        var element = jqLite('<svg width="500" height="500">' +
+        var element = angular.element('<svg width="500" height="500">' +
                                 '<rect class="class-of-doom"></rect>' +
                              '</svg>');
         var child = element.find('rect');
diff --git a/test/ngMessages/messagesSpec.js b/test/ngMessages/messagesSpec.js
index 5c56acb8a349..9aba457771ef 100644
--- a/test/ngMessages/messagesSpec.js
+++ b/test/ngMessages/messagesSpec.js
@@ -12,6 +12,10 @@ describe('ngMessages', function() {
     return str.replace(/\s+/g,'');
   }
 
+  function trim(value) {
+    return isString(value) ? value.trim() : value;
+  }
+
   var element;
   afterEach(function() {
     dealoc(element);