fix up tests

Author: guybedford

karma.conf.js

@@ -46,7 +46,7 @@ module.exports = function(config) {
 
     {pattern: 'test/{loader,loads,syntax,worker}/**/*', included: false},
     {pattern: 'node_modules/when/es6-shim/Promise.js', included: false},
-    {pattern: 'dist/es6-module-loader.js', included: false}
+    {pattern: 'dist/es6-module-loader*.js', included: false}
   ];
 
   // Default Config
@@ -59,7 +59,7 @@ module.exports = function(config) {
     client: {
       mocha: {
         reporter: 'html',
-        timeout: 10000
+        timeout: 8000
       }
     }
   });

test/worker/worker-traceur.js

@@ -1,6 +1,6 @@
 importScripts("../../node_modules/traceur/bin/traceur.js",
              "../../node_modules/when/es6-shim/Promise.js",
-             "../../dist/es6-module-loader-traceur.js");
+             "../../dist/es6-module-loader-traceur-sp.src.js");
 
 System['import']('es6').then(function(m) {
   postMessage(m.p);