diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index b2c0d12b89a3..bfa5d8185008 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1176,7 +1176,7 @@
               }
             },
             "readable-stream": {
-              "version": "1.0.33-1",
+              "version": "1.0.32",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1"
@@ -1210,6 +1210,72 @@
     "canonical-path": {
       "version": "0.0.2"
     },
+    "cheerio": {
+      "version": "0.17.0",
+      "dependencies": {
+        "CSSselect": {
+          "version": "0.4.1",
+          "dependencies": {
+            "CSSwhat": {
+              "version": "0.4.7"
+            },
+            "domutils": {
+              "version": "1.4.3",
+              "dependencies": {
+                "domelementtype": {
+                  "version": "1.1.1"
+                }
+              }
+            }
+          }
+        },
+        "entities": {
+          "version": "1.1.1"
+        },
+        "htmlparser2": {
+          "version": "3.7.3",
+          "dependencies": {
+            "domhandler": {
+              "version": "2.2.0"
+            },
+            "domutils": {
+              "version": "1.5.0"
+            },
+            "domelementtype": {
+              "version": "1.1.1"
+            },
+            "readable-stream": {
+              "version": "1.1.13",
+              "dependencies": {
+                "core-util-is": {
+                  "version": "1.0.1"
+                },
+                "isarray": {
+                  "version": "0.0.1"
+                },
+                "string_decoder": {
+                  "version": "0.10.31"
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                }
+              }
+            },
+            "entities": {
+              "version": "1.0.0"
+            }
+          }
+        },
+        "dom-serializer": {
+          "version": "0.0.1",
+          "dependencies": {
+            "domelementtype": {
+              "version": "1.1.1"
+            }
+          }
+        }
+      }
+    },
     "dgeni": {
       "version": "0.4.1",
       "dependencies": {
@@ -1462,7 +1528,7 @@
               "dependencies": {
                 "fsevents": {
                   "version": "0.2.1",
-                  "from": "git://github.com/pipobscure/fsevents#7dcdf9fa3f8956610fd6f69f72c67bace2de7138",
+                  "from": "fsevents@git://github.com/pipobscure/fsevents#7dcdf9fa3f8956610fd6f69f72c67bace2de7138",
                   "resolved": "git://github.com/pipobscure/fsevents#7dcdf9fa3f8956610fd6f69f72c67bace2de7138",
                   "dependencies": {
                     "nan": {
@@ -1803,7 +1869,7 @@
               "version": "0.1.0"
             },
             "readable-stream": {
-              "version": "1.0.33-1",
+              "version": "1.0.32",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1"
@@ -2276,7 +2342,7 @@
     },
     "grunt-jasmine-node": {
       "version": "0.1.0",
-      "from": "grunt-jasmine-node@git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
+      "from": "grunt-jasmine-node@git://github.com/vojtajina/grunt-jasmine-node.git#ced17cbe52c1412b2ada53160432a5b681f37cd7",
       "resolved": "git://github.com/vojtajina/grunt-jasmine-node.git#ced17cbe52c1412b2ada53160432a5b681f37cd7"
     },
     "grunt-jscs": {
@@ -4091,7 +4157,7 @@
               "version": "1.1.4"
             },
             "readable-stream": {
-              "version": "1.0.27-1",
+              "version": "1.0.32",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1"
@@ -4100,7 +4166,7 @@
                   "version": "0.0.1"
                 },
                 "string_decoder": {
-                  "version": "0.10.25-1"
+                  "version": "0.10.31"
                 },
                 "inherits": {
                   "version": "2.0.1"
@@ -4174,7 +4240,7 @@
               "version": "2.2.0",
               "dependencies": {
                 "readable-stream": {
-                  "version": "1.1.13-1",
+                  "version": "1.1.13",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1"
@@ -4183,7 +4249,7 @@
                       "version": "0.0.1"
                     },
                     "string_decoder": {
-                      "version": "0.10.25-1"
+                      "version": "0.10.31"
                     },
                     "inherits": {
                       "version": "2.0.1"
@@ -4269,7 +4335,7 @@
                   }
                 },
                 "readable-stream": {
-                  "version": "1.0.33-1",
+                  "version": "1.0.32",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1"
@@ -4377,7 +4443,7 @@
                   "version": "0.1.0"
                 },
                 "readable-stream": {
-                  "version": "1.0.33-1",
+                  "version": "1.0.32",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1"
@@ -4445,7 +4511,7 @@
                   "version": "0.9.3",
                   "dependencies": {
                     "readable-stream": {
-                      "version": "1.0.33-1",
+                      "version": "1.0.32",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1"
diff --git a/test/e2e/templates/test.html b/test/e2e/templates/test.html
deleted file mode 100644
index 2eec4e7ce621..000000000000
--- a/test/e2e/templates/test.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-{% if eq(test.ngAppTag, "html") %}
-<html ng-app="{{ test.ngApp }}">
-{% else %}
-<html>
-{% endif %}
-    <head>
-        {% if scripts.jQuery %}
-        <script src="{{ scripts.jQuery }}"></script>
-        {% endif %}
-        {% for script in test.scripts %}
-            <script src="{{ test.scripts[script] }}"></script>
-        {% endfor %}
-        {{ test.head }}
-    </head>
-    {% if test.ngAppTag === "body" %}
-    <body ng-app="{{ test.ngApp }}">
-    {% else %}
-    <body>
-    {% endif %}
-    {% test.body %}
-    </body>
-</html>
diff --git a/test/e2e/tools/fixture.js b/test/e2e/tools/fixture.js
index 26723f032279..586942524141 100644
--- a/test/e2e/tools/fixture.js
+++ b/test/e2e/tools/fixture.js
@@ -46,32 +46,28 @@ function generateFixture(test, query) {
     }
   });
 
-  if (jquery && (!('jquery' in query) || (/^(0|no|false|off|n)$/i).test(query.jquery))) {
-    $(jquery).remove();
-  } else if ('jquery' in query) {
-    if ((/^(0|no|false|off|n)$/i).test(query.jquery)) {
-      if (jquery) {
-        $(jquery).remove();
-      }
-    } else {
-      if (!jquery) {
-        jquery = $.load('<script></script>')('script')[0];
-        if (firstScript) {
-          $(firstScript).before(jquery);
+  if (!('jquery' in query) || (/^(0|no|false|off|n)$/i).test(query.jquery)) {
+    if (jquery) {
+      $(jquery).remove();
+    }
+  } else {
+    if (!jquery) {
+      jquery = $.load('<script></script>')('script')[0];
+      if (firstScript) {
+        $(firstScript).before(jquery);
+      } else {
+        var head = $$('head');
+        if (head.length) {
+          head.prepend(jquery);
         } else {
-          var head = $$('head');
-          if (head.length) {
-            head.prepend(jquery);
-          } else {
-            $$.root().first().before(jquery);
-          }
+          $$.root().first().before(jquery);
         }
       }
-      if (!/^\d+\.\d+.*$/.test(query.jquery)) {
-        $(jquery).attr('src', '/bower_components/jquery/dist/jquery.js');
-      } else {
-        $(jquery).attr('src', '//ajax.googleapis.com/ajax/libs/jquery/' + query.jquery + '/jquery.js');
-      }
+    }
+    if (!/^\d+\.\d+.*$/.test(query.jquery)) {
+      $(jquery).attr('src', '/bower_components/jquery/dist/jquery.js');
+    } else {
+      $(jquery).attr('src', '//ajax.googleapis.com/ajax/libs/jquery/' + query.jquery + '/jquery.js');
     }
   }