diff --git a/api/tests/index.html b/api/tests/index.html
index 37d313f4..e85bd4b7 100644
--- a/api/tests/index.html
+++ b/api/tests/index.html
@@ -13,8 +13,8 @@
 		<script src="../../test-utils/pushStateMock.js"></script>
 		<script src="../../test-utils/xhrMock.js"></script>
 		<script src="../../test-utils/browserMock.js"></script>
-		<script src="../../test-utils/component.js"></script>
-
+		<script src="../../test-utils/components.js"></script>
+		<script src="../../test-utils/throttleMock.js"></script>
 		<script src="../../promise/promise.js"></script>
 		<script src="../../render/vnode.js"></script>
 		<script src="../../render/trust.js"></script>
@@ -28,7 +28,6 @@
 		<script src="../../api/redraw.js"></script>
 		<script src="../../api/mount.js"></script>
 		<script src="../../api/router.js"></script>
-
 		<script src="./test-redraw.js"></script>
 		<script src="./test-mount.js"></script>
 		<script src="./test-router.js"></script>
diff --git a/stream/tests/index.html b/stream/tests/index.html
index 86cb8947..8db5634b 100644
--- a/stream/tests/index.html
+++ b/stream/tests/index.html
@@ -8,11 +8,8 @@
     <script src="../../ospec/ospec.js"></script>
     <script src="../../test-utils/callAsync.js"></script>
     <script src="../stream.js"></script>
-    <script src="../scan.js"></script>
-    <script src="../scanMerge.js"></script>
     <script src="test-stream.js"></script>
     <script src="test-scanMerge.js"></script>
-    <script src="test-scanMerge.js"></script>
 
     <script>require("../../ospec/ospec").run()</script>
   </body>
diff --git a/test-utils/tests/index.html b/test-utils/tests/index.html
index 51b04d73..a0edd42a 100644
--- a/test-utils/tests/index.html
+++ b/test-utils/tests/index.html
@@ -7,21 +7,20 @@
 		<script src="../../module/module.js"></script>
 		<script src="../../ospec/ospec.js"></script>
 		<script src="../../querystring/parse.js"></script>
-
 		<script src="../../test-utils/callAsync.js"></script>
 		<script src="../../test-utils/parseURL.js"></script>
 		<script src="../../test-utils/pushStateMock.js"></script>
 		<script src="../../test-utils/xhrMock.js"></script>
 		<script src="../../test-utils/domMock.js"></script>
 		<script src="../../test-utils/browserMock.js"></script>
-		<script src="../../test-utils/component.js"></script>
+		<script src="../../test-utils/components.js"></script>
 		<script src="test-callAsync.js"></script>
 		<script src="test-parseURL.js"></script>
 		<script src="test-pushStateMock.js"></script>
 		<script src="test-xhrMock.js"></script>
 		<script src="test-domMock.js"></script>
 		<script src="test-browserMock.js"></script>
-		<script src="test-component.js"></script>
+		<script src="test-components.js"></script>
 
 		<script>require("../../ospec/ospec").run()</script>
 	</body>
diff --git a/tests/index.html b/tests/index.html
index 91db3a04..21f8359b 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -9,6 +9,7 @@
 		<script src="../querystring/parse.js"></script>
 		<script src="../test-utils/parseURL.js"></script>
 		<script src="../test-utils/callAsync.js"></script>
+		<script src="../test-utils/components.js"></script>
 		<script src="../test-utils/domMock.js"></script>
 		<script src="../test-utils/pushStateMock.js"></script>
 		<script src="../test-utils/xhrMock.js"></script>