       handler = m.createHandler fileList, staticFolderPath, adapterFolderPath, baseFolder, mockProxy,
           {'/_testacular_/': 'http://localhost:9000'}, '/_testacular_/'
       handler new httpMock.ServerRequest('/base/other.js'), response
-      waitForFinishingResponse()
-
-      runs ->
+      waitForFinishingResponseAnd ->
         expect(response._status).toBe 404
         expect(response._body).toBe 'NOT FOUND'
 
 
     it 'should serve static files after proxy', ->
       handler new httpMock.ServerRequest('/base/a.js'), response
-      waitForFinishingResponse()
-
-      runs ->
+      waitForFinishingResponseAnd ->
         expect(response._body).toBe 'js-src-a'
         expect(response._status).toBe 200
 
 
     it 'should delegate to proxy after checking for testacular files', ->
       handler new httpMock.ServerRequest('/_testacular_/not_client.html'), response
-      waitForFinishingResponse()
-
-      runs ->
+      waitForFinishingResponseAnd ->
         expect(actualOptions).toEqual {host: 'localhost', port: '9000'}
 
 
     it 'should delegate to proxy after checking for source files', ->
       handler new httpMock.ServerRequest('/base/not_client.html'), response
-      waitForFinishingResponse()
-
-      runs ->
+      waitForFinishingResponseAnd ->
         expect(actualOptions).toEqual {host: 'localhost', port: '1000'}
 
 
     it 'should give 404 for missing files', ->
       handler new httpMock.ServerRequest('/file/non-existent.html'), response
-      waitForFinishingResponse()
-
-      runs ->
+      waitForFinishingResponseAnd ->
         expect(response._status).toBe 404
         expect(response._body).toBe 'NOT FOUND'
 

        {path: '/tcular/adapter/c.js', mtime: new Date 321}]

      tcularSrcHandler new httpMock.ServerRequest('/_testacular_/context.html'), response
      waitForFinishingResponse()

      runs ->
        expect(response._body).toEqual 'window.__testacular__.files = {\n' +
        "  '/absolute/some/abs/a.js': '12345',\n" +
        "  '/base/b.js': '67890',\n" +

      servedFiles = [{path: '/src/some.js', contentPath: '/src/some.js', mtime: new Date 12345}]

      srcFileHandler new httpMock.ServerRequest('/absolute/src/some.js?123345'), response
      waitForFinishingResponseAnd ->
        expect(response._body).toBe 'js-source'
        expect(response._status).toBe 200

