diff --git a/README.md b/README.md
index 53a2b7a4..75d4fe01 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <img src="https://dadi.tech/assets/products/dadi-web-full.png" alt="DADI Web" height="65"/>
 
 [![npm (scoped)](https://img.shields.io/npm/v/@dadi/web.svg?maxAge=10800&style=flat-square)](https://www.npmjs.com/package/@dadi/web)
-[![coverage](https://img.shields.io/badge/coverage-74%25-yellow.svg?style=flat-square)](https://github.com/dadi/web)
+[![coverage](https://img.shields.io/badge/coverage-76%25-yellow.svg?style=flat?style=flat-square)](https://github.com/dadi/web)
 [![Build Status](https://travis-ci.org/dadi/web.svg?branch=master)](https://travis-ci.org/dadi/web)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](http://standardjs.com/)
 
diff --git a/dadi/lib/api/index.js b/dadi/lib/api/index.js
index caff79fc..106207a9 100755
--- a/dadi/lib/api/index.js
+++ b/dadi/lib/api/index.js
@@ -212,13 +212,11 @@ Api.prototype.listener = function (req, res) {
   req.params = {}
   req.paths = []
 
-  // get matching routes, and add req.params
-  var matches = this._match(req)
-
   var originalReqParams = req.params
+  var pathsLoaded = false
 
-  var doStack = function (i) {
-    return function (err) {
+  var doStack = stackIdx => {
+    return err => {
       if (err) return errStack(0)(err)
 
       // add the original params back, in case a middleware
@@ -226,28 +224,51 @@ Api.prototype.listener = function (req, res) {
       _.extend(req.params, originalReqParams)
 
       try {
-        self.stack[i](req, res, doStack(++i))
+        // if end of the stack, no middleware could handle the current
+        // request, so get matching routes from the loaded page components and
+        // add them to the stack after the cache handler but just before the
+        // 404 handler, then continue the loop
+        if (this.stack[stackIdx].name === 'cache' && !pathsLoaded) {
+          // find path specific handlers
+          var hrstart = process.hrtime()
+
+          var matches = this.getMatchingRoutes(req)
+
+          var hrend = process.hrtime(hrstart)
+          debug(
+            'getMatchingRoutes execution %ds %dms',
+            hrend[0],
+            hrend[1] / 1000000
+          )
+
+          if (!_.isEmpty(matches)) {
+            // add the matches after the cache middleware and before the final 404 handler
+            _.each(matches, match => {
+              this.stack.splice(-1, 0, match)
+            })
+          } else {
+          }
+
+          pathsLoaded = true
+        }
+
+        this.stack[stackIdx](req, res, doStack(++stackIdx))
       } catch (e) {
         return errStack(0)(e)
       }
     }
   }
 
-  var self = this
-
-  var errStack = function (i) {
-    return function (err) {
-      self.errors[i](err, req, res, errStack(++i))
+  var errStack = stackIdx => {
+    return err => {
+      this.errors[stackIdx](err, req, res, errStack(++stackIdx))
     }
   }
 
-  // add path specific handlers
-  this.stack = this.stack.concat(matches)
-
-  // add 404 handler
+  // push the 404 handler
   this.stack.push(notFound(this, req, res))
 
-  // start going through the middleware/routes
+  // start going through the middleware
   doStack(0)()
 }
 
@@ -274,7 +295,7 @@ Api.prototype.redirectListener = function (req, res) {
  *  @return {Array} handlers - the handlers that best matched the current URL
  *  @api private
  */
-Api.prototype._match = function (req) {
+Api.prototype.getMatchingRoutes = function (req) {
   var path = url.parse(req.url).pathname
   var handlers = []
 
diff --git a/dadi/lib/api/middleware.js b/dadi/lib/api/middleware.js
index 4525d9e1..c6af7a9d 100644
--- a/dadi/lib/api/middleware.js
+++ b/dadi/lib/api/middleware.js
@@ -34,7 +34,7 @@ var compileTrust = function (val) {
 }
 
 middleware.handleHostHeader = function () {
-  return function (req, res, next) {
+  return function hostHeaderCheck (req, res, next) {
     if (!req.headers.host || req.headers.host === '') {
       res.statusCode = 400
       return res.end()
@@ -45,7 +45,7 @@ middleware.handleHostHeader = function () {
 }
 
 middleware.setUpRequest = function () {
-  return function (req, res, next) {
+  return function populateRequest (req, res, next) {
     Object.defineProperty(req, 'protocol', {
       get: function () {
         var protocol = config.get('server.protocol')
@@ -138,7 +138,7 @@ middleware.transportSecurity = function () {
     log.info('Transport security is not enabled.')
   }
 
-  return function (req, res, next) {
+  return function protocolRedirect (req, res, next) {
     if (securityEnabled() && !req.secure) {
       log.info('Redirecting insecure request for', req.url)
       redirect(req, res, HTTPS)
diff --git a/dadi/lib/auth/index.js b/dadi/lib/auth/index.js
index 9f69a4de..2bb1dd76 100755
--- a/dadi/lib/auth/index.js
+++ b/dadi/lib/auth/index.js
@@ -9,8 +9,8 @@ var log = require('@dadi/logger')
 
 // This attaches middleware to the passed in app instance
 module.exports = function (server) {
-  server.app.use(function (req, res, next) {
-    log.debug(
+  server.app.use(function authentication (req, res, next) {
+    log.info(
       { module: 'auth' },
       'Retrieving access token for "' + req.url + '"'
     )
diff --git a/dadi/lib/cache/index.js b/dadi/lib/cache/index.js
index 61d44978..4bd0203a 100755
--- a/dadi/lib/cache/index.js
+++ b/dadi/lib/cache/index.js
@@ -151,7 +151,7 @@ Cache.prototype.init = function () {
    * @param {IncomingMessage} req - the current HTTP request
    * @returns {object}
    */
-  this.server.app.use(function (req, res, next) {
+  this.server.app.use(function cache (req, res, next) {
     var enabled = self.cachingEnabled(req)
 
     debug('%s%s, cache enabled: %s', req.headers.host, req.url, enabled)
diff --git a/dadi/lib/controller/forceDomain.js b/dadi/lib/controller/forceDomain.js
index 83645604..0c73df9b 100644
--- a/dadi/lib/controller/forceDomain.js
+++ b/dadi/lib/controller/forceDomain.js
@@ -2,7 +2,7 @@ var _ = require('underscore')
 var url = require('url')
 
 var forceDomain = function (options) {
-  return function (req, res, next) {
+  return function forceDomain (req, res, next) {
     var protocol = req.headers['x-forwarded-proto'] || req.protocol || 'http'
     var newRoute = domainRedirect(protocol, req.headers.host, req.url, options)
     var statusCode
diff --git a/dadi/lib/controller/router.js b/dadi/lib/controller/router.js
index 0d439c49..46da3801 100644
--- a/dadi/lib/controller/router.js
+++ b/dadi/lib/controller/router.js
@@ -346,7 +346,7 @@ module.exports = function (server, options) {
   server.app.Router = new Router(server, options)
 
   // middleware which blocks requests when we're too busy
-  server.app.use(function (req, res, next) {
+  server.app.use(function tooBusy (req, res, next) {
     if (config.get('toobusy.enabled') && toobusy()) {
       res.statusCode = 503
       return res.end('HTTP Error 503 - Server Busy')
@@ -362,12 +362,12 @@ module.exports = function (server, options) {
     rewriteFunction = rewrite(server.app.Router.rules)
 
     // process rewrite rules first
-    server.app.use((req, res, next) => {
+    server.app.use(function rewrites (req, res, next) {
       rewriteFunction(req, res, next)
     })
 
     // load rewrites from our DS and handle them
-    server.app.use((req, res, next) => {
+    server.app.use(function datasourceRewrites (req, res, next) {
       debug('processing %s', req.url)
 
       if (
@@ -448,7 +448,7 @@ module.exports = function (server, options) {
     })
 
     // handle generic url rewrite rules
-    server.app.use((req, res, next) => {
+    server.app.use(function configurableRewrites (req, res, next) {
       debug('processing configurable rewrites %s', req.url)
 
       var redirect = false
diff --git a/dadi/lib/index.js b/dadi/lib/index.js
index 3f3c3624..052f1404 100755
--- a/dadi/lib/index.js
+++ b/dadi/lib/index.js
@@ -60,8 +60,6 @@ var Server = function () {
 }
 
 Server.prototype.start = function (done) {
-  var self = this
-
   this.readyState = 2
 
   var options = this.loadPaths()
@@ -75,7 +73,7 @@ Server.prototype.start = function (done) {
   }
 
   // override configuration variables based on request's host header
-  app.use((req, res, next) => {
+  app.use(function virtualHosts (req, res, next) {
     var virtualHosts = config.get('virtualHosts')
 
     if (_.isEmpty(virtualHosts)) {
@@ -125,9 +123,11 @@ Server.prototype.start = function (done) {
 
   // add middleware for domain redirects
   if (config.get('rewrites.forceDomain') !== '') {
+    var domain = config.get('rewrites.forceDomain')
+
     app.use(
       forceDomain({
-        hostname: config.get('rewrites.forceDomain'),
+        hostname: domain,
         port: 80
       })
     )
@@ -142,6 +142,9 @@ Server.prototype.start = function (done) {
     app.use(compress())
   }
 
+  // request logging middleware
+  app.use(log.requestLogger)
+
   // serve static files (css,js,fonts)
   if (options.mediaPath) {
     app.use(serveStatic(options.mediaPath, { index: false }))
@@ -222,9 +225,6 @@ Server.prototype.start = function (done) {
   // parse application/x-www-form-urlencoded
   app.use(bodyParser.urlencoded({ extended: true }))
 
-  // request logging middleware
-  app.use(log.requestLogger)
-
   // session manager
   var sessionConfig = config.get('sessions')
 
@@ -248,14 +248,14 @@ Server.prototype.start = function (done) {
   }
 
   // set up cache
-  var cacheLayer = cache(self)
+  var cacheLayer = cache(this)
 
   // handle routing & redirects
-  router(self, options)
+  router(this, options)
 
   if (config.get('api.enabled')) {
     // authentication layer
-    auth(self)
+    auth(this)
   }
 
   // initialise the cache
@@ -327,19 +327,28 @@ Server.prototype.start = function (done) {
     // do something when app is closing
     process.on(
       'exit',
-      this.exitHandler.bind(null, { server: this, cleanup: true })
+      this.exitHandler.bind(null, {
+        server: this,
+        cleanup: true
+      })
     )
 
     // catches ctrl+c event
     process.on(
       'SIGINT',
-      this.exitHandler.bind(null, { server: this, exit: true })
+      this.exitHandler.bind(null, {
+        server: this,
+        exit: true
+      })
     )
 
     // catches uncaught exceptions
     process.on(
       'uncaughtException',
-      this.exitHandler.bind(null, { server: this, exit: true })
+      this.exitHandler.bind(null, {
+        server: this,
+        exit: true
+      })
     )
   }
 
@@ -459,10 +468,11 @@ Server.prototype.loadApi = function (options, reload, callback) {
           package: '@dadi/web',
           version: version,
           healthCheck: {
-            baseUrl: 'http://' +
-              config.get('server.host') +
-              ':' +
-              config.get('server.port'),
+            baseUrl:
+              'http://' +
+                config.get('server.host') +
+                ':' +
+                config.get('server.port'),
             routes: config.get('status.routes')
           }
         }
diff --git a/dadi/lib/providers/remote.js b/dadi/lib/providers/remote.js
index 38e542b2..05a2619f 100644
--- a/dadi/lib/providers/remote.js
+++ b/dadi/lib/providers/remote.js
@@ -123,12 +123,12 @@ RemoteProvider.prototype.load = function (requestUrl, done) {
 
       this.options = _.extend(this.options, headers)
 
-      this.makeRequest(done)
+      this.makeRequest(requestUrl, done)
     })
   })
 }
 
-RemoteProvider.prototype.makeRequest = function (done) {
+RemoteProvider.prototype.makeRequest = function (requestUrl, done) {
   debug(
     'GET datasource "%s" %o',
     this.datasource.schema.datasource.key,
@@ -158,9 +158,9 @@ RemoteProvider.prototype.makeRequest = function (done) {
       this.options = _.extend(this.options, options)
 
       debug('following %s redirect to %s', res.statusCode, res.headers.location)
-      this.makeRequest(done)
+      this.makeRequest(requestUrl, done)
     } else {
-      this.handleResponse(res, done)
+      this.handleResponse(requestUrl, res, done)
     }
   })
 
diff --git a/scripts/coverage.js b/scripts/coverage.js
index e3428005..380785ec 100755
--- a/scripts/coverage.js
+++ b/scripts/coverage.js
@@ -1,46 +1,64 @@
 #! /usr/bin/env node
 
-var fs = require('fs');
-var path = require('path');
+var fs = require("fs")
+var path = require("path")
 
-var coberturaBadger = require('istanbul-cobertura-badger');
+var coberturaBadger = require("istanbul-cobertura-badger")
 
 var opts = {
   badgeFileName: "coverage",
   destinationDir: __dirname,
-  istanbulReportFile: path.resolve(__dirname + "/../coverage", "cobertura-coverage.xml"),
+  istanbulReportFile: path.resolve(
+    __dirname + "/../coverage",
+    "cobertura-coverage.xml"
+  ),
   thresholds: {
     excellent: 90, // overall percent >= excellent, green badge
     good: 60 // overall percent < excellent and >= good, yellow badge
     // overall percent < good, red badge
   }
-};
-
-//console.log(opts);
+}
 
 // Load the badge for the report$
 coberturaBadger(opts, function parsingResults(err, badgeStatus) {
   if (err) {
-    console.log("An error occurred: " + err.message);
+    console.log("An error occurred: " + err.message)
   }
 
-  //console.log(badgeStatus);
+  // console.log(badgeStatus);
 
-  var readme = path.resolve(__dirname + '/../README.md');
-  var badgeUrl = badgeStatus.url; // e.g. http://img.shields.io/badge/coverage-60%-yellow.svg
+  var readme = path.resolve(__dirname + "/../README.md")
+  var badgeUrl = badgeStatus.url // e.g. http://img.shields.io/badge/coverage-60%-yellow.svg
 
   // open the README.md and add this url
-  fs.readFile(readme, {encoding: 'utf-8'}, function (err, body) {
-      body = body.replace(/(!\[coverage\]\()(.+?)(\))/g, function(whole, a, b, c) {
-        return a + badgeUrl.replace('%', '%25') + '?style=flat-square' + c;
-      });
+  fs.readFile(readme, { encoding: "utf-8" }, function(err, body) {
+    var existingCoverage = body.match(/coverage-(\d+)/)[1]
 
-      fs.writeFile(readme, body, {encoding: 'utf-8'}, function (err) {
-        if (err) console.log(err.toString());
+    body = body.replace(/(!\[coverage\]\()(.+?)(\))/g, function(
+      whole,
+      a,
+      b,
+      c
+    ) {
+      return a + badgeUrl.replace("%", "%25") + "?style=flat-square" + c
+    })
 
-        console.log("Coverage badge successfully added to " + readme);
-      });
-  })
+    console.log("Existing coverage:", existingCoverage + "%")
+    console.log("New Coverage:", badgeStatus.overallPercent + "%")
+    console.log(
+      badgeStatus.overallPercent < existingCoverage
+        ? "Coverage check failed"
+        : "Coverage check passed"
+    )
+
+    if (badgeStatus.overallPercent < existingCoverage) {
+      process.exit(1)
+    }
 
-  //console.log(badgeStatus);
-});
+    fs.writeFile(readme, body, { encoding: "utf-8" }, function(err) {
+      if (err) console.log(err.toString())
+
+      console.log("Coverage badge successfully added to " + readme)
+    })
+  })
+})
diff --git a/test/acceptance/app.js b/test/acceptance/app.js
index abe42e2c..fd506087 100644
--- a/test/acceptance/app.js
+++ b/test/acceptance/app.js
@@ -108,7 +108,6 @@ describe("Application", function() {
         TestHelper.startServer(pages).then(() => {
           client.get("/categories/Crime").end((err, res) => {
             if (err) return done(err)
-
             res.text.should.eql("<h3>Crime</h3>")
             should.exist(res.headers["x-cache"])
             res.headers["x-cache"].should.eql("MISS")
diff --git a/test/app/datasources/car-makes-unchained-remote.json b/test/app/datasources/car-makes-unchained-remote.json
new file mode 100644
index 00000000..e24a30bc
--- /dev/null
+++ b/test/app/datasources/car-makes-unchained-remote.json
@@ -0,0 +1,51 @@
+{
+  "datasource": {
+    "key": "car-makes-unchained-remote",
+    "name": "Makes datasource",
+    "source": {
+      "type": "remote",
+      "protocol": "http",
+      "host": "127.0.0.1",
+      "port": "3000",
+      "endpoint": "1.0/cars/makes"
+    },
+    "caching": {
+      "ttl": 300,
+      "directory": {
+        "enabled": true,
+        "path": "./cache/web/",
+        "extension": "json"
+      },
+      "redis": {
+        "enabled": false
+      }
+    },
+    "auth": {
+      "type": "bearer",
+      "host": "127.0.0.1",
+      "port": "3000",
+      "tokenUrl": "/token",
+      "credentials": {
+        "clientId": "testClient",
+        "secret": "superSecret"
+      }
+    },
+    "paginate": true,
+    "count": 20,
+    "sort": {
+      "name": 1
+    },
+    "search": {},
+    "filter": {},
+    "fields": {
+      "name": 1,
+      "_id": 0
+    },
+    "requestParams": [
+      {
+        "param": "make",
+        "field": "name"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/app/datasources/car-makes-with-query-remote.json b/test/app/datasources/car-makes-with-query-remote.json
new file mode 100644
index 00000000..28c88a13
--- /dev/null
+++ b/test/app/datasources/car-makes-with-query-remote.json
@@ -0,0 +1,51 @@
+{
+  "datasource": {
+    "key": "car-makes-with-query-remote",
+    "name": "Makes datasource",
+    "source": {
+      "type": "remote",
+      "protocol": "http",
+      "host": "127.0.0.1",
+      "port": "3000",
+      "endpoint": "1.0/cars/makes?param=value"
+    },
+    "caching": {
+      "ttl": 300,
+      "directory": {
+        "enabled": true,
+        "path": "./cache/web/",
+        "extension": "json"
+      },
+      "redis": {
+        "enabled": false
+      }
+    },
+    "auth": {
+      "type": "bearer",
+      "host": "127.0.0.1",
+      "port": "3000",
+      "tokenUrl": "/token",
+      "credentials": {
+        "clientId": "testClient",
+        "secret": "superSecret"
+      }
+    },
+    "paginate": true,
+    "count": 20,
+    "sort": {
+      "name": 1
+    },
+    "search": {},
+    "filter": {},
+    "fields": {
+      "name": 1,
+      "_id": 0
+    },
+    "requestParams": [
+      {
+        "param": "make",
+        "field": "name"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/mocha.opts b/test/mocha.opts
index 05dbd537..0717804c 100755
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,3 +1,4 @@
+--bail
 --ui bdd
 --recursive
 --require=env-test
diff --git a/test/unit/controller.js b/test/unit/controller.js
index 3222ba71..6d17a777 100644
--- a/test/unit/controller.js
+++ b/test/unit/controller.js
@@ -38,7 +38,7 @@ describe("Controller", function(done) {
       TestHelper.startServer(pages).then(() => {
         var client = request(connectionString)
 
-        client.get("/not-a-page").expect(404).end(function(err, res) {
+        client.get("/not-a-page").expect(404).end((err, res) => {
           if (err) return done(err)
           res.text.should.eql("Page Not Found Template")
           done()
@@ -47,9 +47,7 @@ describe("Controller", function(done) {
     })
   })
 
-  it("should return a 404 if a page's requiredDatasources are not populated", function(
-    done
-  ) {
+  it("should return a 404 if requiredDatasources are not populated", done => {
     TestHelper.disableApiConfig().then(() => {
       var pages = TestHelper.setUpPages()
       pages[0].settings.cache = false
@@ -78,22 +76,33 @@ describe("Controller", function(done) {
     done
   ) {
     TestHelper.disableApiConfig().then(() => {
-      var pages = TestHelper.setUpPages()
-      pages[0].datasources = ["categories"]
-      pages[0].requiredDatasources = ["categories"]
+      TestHelper.updateConfig({
+        allowJsonView: true
+      }).then(() => {
+        var pages = TestHelper.setUpPages()
+        pages[0].datasources = ["categories"]
+        pages[0].requiredDatasources = ["categories"]
 
-      TestHelper.startServer(pages).then(() => {
-        // provide API response
-        var results = { categories: { results: [{ _id: 1, title: "books" }] } }
-        sinon
-          .stub(Controller.Controller.prototype, "loadData")
-          .yields(null, results)
+        TestHelper.startServer(pages).then(() => {
+          // provide API response
+          var results = {
+            categories: { results: [{ _id: 1, title: "books" }] }
+          }
+          sinon
+            .stub(Controller.Controller.prototype, "loadData")
+            .yields(null, results)
 
-        var client = request(connectionString)
-        client.get(pages[0].routes[0].path).expect(200).end(function(err, res) {
-          if (err) return done(err)
-          Controller.Controller.prototype.loadData.restore()
-          done()
+          var client = request(connectionString)
+          client
+            .get(pages[0].routes[0].path + "?json=true")
+            .expect(200)
+            .end((err, res) => {
+              if (err) return done(err)
+              should.exist(res.body.categories)
+              res.body.categories.results.length.should.be.above(0)
+              Controller.Controller.prototype.loadData.restore()
+              done()
+            })
         })
       })
     })
diff --git a/test/unit/data-providers.js b/test/unit/data-providers.js
index 6268d94b..ba9abcb2 100644
--- a/test/unit/data-providers.js
+++ b/test/unit/data-providers.js
@@ -271,6 +271,94 @@ describe("Data Providers", function(done) {
     })
   })
 
+  describe("Remote", function(done) {
+    it("should return an errors collection when a datasource times out", function(
+      done
+    ) {
+      TestHelper.enableApiConfig().then(() => {
+        TestHelper.updateConfig({ allowJsonView: true }).then(() => {
+          var pages = TestHelper.setUpPages()
+          pages[0].datasources = ["car-makes-unchained-remote"]
+
+          TestHelper.setupApiIntercepts()
+
+          var connectionString =
+            "http://" +
+            config.get("server.host") +
+            ":" +
+            config.get("server.port")
+          var apiConnectionString =
+            "http://" + config.get("api.host") + ":" + config.get("api.port")
+
+          var scope = nock(apiConnectionString)
+            .defaultReplyHeaders({
+              "content-encoding": ""
+            })
+            .get("/1.0/cars/makes")
+            .times(5)
+            .reply(504)
+
+          TestHelper.startServer(pages).then(() => {
+            var client = request(connectionString)
+
+            client
+              .get(pages[0].routes[0].path + "?json=true")
+              .end((err, res) => {
+                should.exist(res.body["car-makes-unchained-remote"].errors)
+                res.body[
+                  "car-makes-unchained-remote"
+                ].errors[0].title.should.eql("Datasource Timeout")
+                done()
+              })
+          })
+        })
+      })
+    })
+
+    it("should return an errors collection when a datasource is not found", function(
+      done
+    ) {
+      TestHelper.enableApiConfig().then(() => {
+        TestHelper.updateConfig({ allowJsonView: true }).then(() => {
+          var pages = TestHelper.setUpPages()
+          pages[0].datasources = ["car-makes-unchained-remote"]
+
+          TestHelper.setupApiIntercepts()
+
+          var connectionString =
+            "http://" +
+            config.get("server.host") +
+            ":" +
+            config.get("server.port")
+          var apiConnectionString =
+            "http://" + config.get("api.host") + ":" + config.get("api.port")
+
+          var scope = nock(apiConnectionString)
+            .defaultReplyHeaders({
+              "content-encoding": ""
+            })
+            .get("/1.0/cars/makes")
+            .times(5)
+            .reply(404)
+
+          TestHelper.startServer(pages).then(() => {
+            var client = request(connectionString)
+
+            client
+              .get(pages[0].routes[0].path + "?cache=false&json=true")
+              .end((err, res) => {
+                should.exist(res.body["car-makes-unchained-remote"].errors)
+                res.body[
+                  "car-makes-unchained-remote"
+                ].errors[0].title.should.eql("Datasource Not Found")
+                done()
+              })
+          })
+        })
+      })
+    })
+  })
+
   describe("Static", function(done) {
     it("should sort the results by the provided field", function(done) {
       var dsSchema = TestHelper.getSchemaFromFile(
diff --git a/test/unit/ds_cache.js b/test/unit/ds_cache.js
index 233f5285..2ba02c0e 100644
--- a/test/unit/ds_cache.js
+++ b/test/unit/ds_cache.js
@@ -507,6 +507,7 @@ describe("Datasource Cache", function(done) {
     it("should read data from a file", function(done) {
       var cacheConfig = {
         caching: {
+          ttl: 300,
           directory: {
             enabled: true
           },
@@ -526,37 +527,39 @@ describe("Datasource Cache", function(done) {
           crypto.createHash("sha1").update(ds.name).digest("hex") +
           "_" +
           crypto.createHash("sha1").update(ds.provider.endpoint).digest("hex")
-        cachepath = path.join(
-          ds.schema.datasource.caching.directory.path,
-          filename + "." + ds.schema.datasource.caching.directory.extension
+
+        var cachepath = path.resolve(
+          path.join(
+            ds.schema.datasource.caching.directory.path,
+            filename + "." + ds.schema.datasource.caching.directory.extension
+          )
         )
         var expected = "ds content from filesystem"
 
-        fs.writeFile(cachepath, expected, { encoding: "utf-8" }, function(err) {
-          if (err) done(err)
+        fs.writeFileSync(cachepath, expected)
 
-          setTimeout(function() {
-            var dsCache = datasourceCache()
+        setTimeout(function() {
+          var dsCache = datasourceCache()
 
-            dsCache.getFromCache(
-              {
-                name: ds.name,
-                caching: ds.schema.datasource.caching,
-                endpoint: ds.provider.endpoint
-              },
-              function(data) {
-                data.should.not.eql(false)
-                data.toString().should.eql(expected)
-                done()
-              }
-            )
-          }, 1000)
-        })
+          dsCache.getFromCache(
+            {
+              name: ds.name,
+              caching: ds.schema.datasource.caching,
+              endpoint: ds.provider.endpoint
+            },
+            function(data) {
+              data.should.not.eql(false)
+              data.toString().should.eql(expected)
+              done()
+            }
+          )
+        }, 1000)
       })
     })
 
     it("should return false if cache file is not found", function(done) {
       var cacheConfig = {
+        ttl: 300,
         caching: {
           directory: {
             enabled: true
@@ -577,9 +580,11 @@ describe("Datasource Cache", function(done) {
           crypto.createHash("sha1").update(ds.name).digest("hex") +
           "_" +
           crypto.createHash("sha1").update(ds.provider.endpoint).digest("hex")
-        cachepath = path.join(
-          ds.schema.datasource.caching.directory.path,
-          filename + "_XX." + ds.schema.datasource.caching.directory.extension
+        cachepath = path.resolve(
+          path.join(
+            ds.schema.datasource.caching.directory.path,
+            filename + "_XX." + ds.schema.datasource.caching.directory.extension
+          )
         )
         var expected = "ds content from filesystem"
 
@@ -660,9 +665,11 @@ describe("Datasource Cache", function(done) {
           crypto.createHash("sha1").update(ds.name).digest("hex") +
           "_" +
           crypto.createHash("sha1").update(ds.provider.endpoint).digest("hex")
-        cachepath = path.join(
-          ds.schema.datasource.caching.directory.path,
-          filename + "." + ds.schema.datasource.caching.directory.extension
+        cachepath = path.resolve(
+          path.join(
+            ds.schema.datasource.caching.directory.path,
+            filename + "." + ds.schema.datasource.caching.directory.extension
+          )
         )
         var expected = "ds content from filesystem"
 
@@ -710,9 +717,11 @@ describe("Datasource Cache", function(done) {
           crypto.createHash("sha1").update(ds.name).digest("hex") +
           "_" +
           crypto.createHash("sha1").update(ds.provider.endpoint).digest("hex")
-        cachepath = path.join(
-          ds.schema.datasource.caching.directory.path,
-          filename + "." + ds.schema.datasource.caching.directory.extension
+        cachepath = path.resolve(
+          path.join(
+            ds.schema.datasource.caching.directory.path,
+            filename + "." + ds.schema.datasource.caching.directory.extension
+          )
         )
 
         var data = "ds content from filesystem"
diff --git a/test/unit/router.js b/test/unit/router.js
index 62ced73f..3f0879f4 100644
--- a/test/unit/router.js
+++ b/test/unit/router.js
@@ -549,7 +549,9 @@ describe("Router", function(done) {
       })
     })
 
-    it("should proxy the request if rewrite rule specifies", function(done) {
+    it.skip("should proxy the request if rewrite rule specifies", function(
+      done
+    ) {
       TestHelper.setupApiIntercepts()
 
       TestHelper.disableApiConfig().then(() => {