From b392d1925a9f961d7b4bf781ee86393a7773ed4b Mon Sep 17 00:00:00 2001
From: Katharina Irrgang <katharina.irrgang@googlemail.com>
Date: Tue, 5 Jun 2018 19:02:20 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8Dynamic=20Routing=20Beta=20(#9596)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs #9601

### Dynamic Routing

This is the beta version of dynamic routing.

- we had a initial implementation of "channels" available in the codebase
- we have removed and moved this implementation
- there is now a centralised place for dynamic routing - server/services/routing
- each routing component is represented by a router type e.g. collections, routes, static pages, taxonomies, rss, preview of posts
- keep as much as possible logic of routing helpers, middlewares and controllers
- ensure test coverage
- connect all the things together
  - yaml file + validation
  - routing + routers
  - url service
  - sitemaps
  - url access
- deeper implementation of yaml validations
  - e.g. hard require slashes
- ensure routing hierarchy/order
  - e.g. you enable the subscriber app
  - you have a custom static page, which lives under the same slug /subscribe
  - static pages are stronger than apps
  - e.g. the first collection owns the post it has filtered
  - a post cannot live in two collections
- ensure apps are still working and hook into the routers layer (or better said: and register in the routing service)
- put as much as possible comments to the code base for better understanding
- ensure a clean debug log
- ensure we can unmount routes
  - e.g. you have a collection permalink of /:slug/ represented by {globals.permalink}
  - and you change the permalink in the admin to dated permalink
  - the express route get's refreshed from /:slug/ to /:year/:month/:day/:slug/
  - unmount without server restart, yey
- ensure we are backwards compatible
  - e.g. render home.hbs for collection index if collection route is /
  - ensure you can access your configured permalink from the settings table with {globals.permalink}

### Render 503 if url service did not finish

- return 503 if the url service has not finished generating the resource urls

### Rewrite sitemaps

- we have rewritten the sitemaps "service", because the url generator does no longer happen on runtime
- we generate all urls on bootstrap
- the sitemaps service will consume created resource and router urls
- these urls will be shown on the xml pages
- we listen on url events
- we listen on router events
- we no longer have to fetch the resources, which is nice
  - the urlservice pre-fetches resources and emits their urls
- the urlservice is the only component who knows which urls are valid
- i made some ES6 adaptions
- we keep the caching logic -> only regenerate xml if there is a change
- updated tests
- checked test coverage (100%)

### Re-work usage of Url utility

- replace all usages of `urlService.utils.urlFor` by `urlService.getByResourceId`
  - only for resources e.g. post, author, tag
- this is important, because with dynamic routing we no longer create static urls based on the settings permalink on runtime
- adapt url utility
- adapt tests
---
 content/settings/README.md                    |    2 +-
 core/server/api/db.js                         |    2 +-
 core/server/apps/amp/lib/router.js            |   40 +-
 .../apps/private-blogging/lib/router.js       |   16 +-
 .../subscribers/lib/helpers/subscribe_form.js |    4 +-
 core/server/apps/subscribers/lib/router.js    |   25 +-
 core/server/controllers/channel.js            |   46 -
 core/server/controllers/entry.js              |   16 +-
 .../server/controllers/frontend/fetch-data.js |  125 --
 .../controllers/frontend/post-lookup.js       |   73 -
 .../controllers/frontend/render-channel.js    |   16 -
 core/server/controllers/index.js              |    4 -
 core/server/controllers/preview.js            |    2 +-
 core/server/controllers/rss.js                |   70 -
 core/server/data/meta/author_url.js           |    5 +-
 core/server/data/meta/rss_url.js              |   18 +-
 core/server/data/meta/url.js                  |   12 +-
 .../server/data/xml/sitemap/base-generator.js |  194 +--
 core/server/data/xml/sitemap/handler.js       |   59 +-
 .../data/xml/sitemap/index-generator.js       |   44 +-
 core/server/data/xml/sitemap/index.js         |    3 -
 core/server/data/xml/sitemap/manager.js       |  120 +-
 .../server/data/xml/sitemap/page-generator.js |   71 +-
 .../server/data/xml/sitemap/post-generator.js |   57 +-
 core/server/data/xml/sitemap/tag-generator.js |   55 +-
 .../server/data/xml/sitemap/user-generator.js |   66 +-
 core/server/helpers/author.js                 |   13 +-
 core/server/helpers/authors.js                |   17 +-
 core/server/helpers/img_url.js                |    4 +-
 core/server/helpers/proxy.js                  |    2 +-
 core/server/helpers/tags.js                   |   16 +-
 core/server/index.js                          |   13 +-
 core/server/models/base/index.js              |    7 +-
 core/server/models/post.js                    |   28 +-
 core/server/models/tag.js                     |    3 +-
 core/server/services/apps/proxy.js            |   11 +-
 core/server/services/channels/Channel.js      |   62 -
 core/server/services/channels/Channels2.js    |  165 ---
 .../services/channels/config.channels.json    |   41 -
 core/server/services/channels/index.js        |   13 -
 core/server/services/channels/loader.js       |   30 -
 .../server/services/channels/parent-router.js |   19 -
 core/server/services/channels/router.js       |   93 --
 core/server/services/route/app-router.js      |    4 -
 core/server/services/route/index.js           |   22 -
 core/server/services/route/registry.js        |   12 -
 core/server/services/route/site-router.js     |    5 -
 .../services/routing/CollectionRouter.js      |  157 ++
 .../{route => routing}/ParentRouter.js        |   51 +-
 core/server/services/routing/PreviewRouter.js |   29 +
 core/server/services/routing/RSSRouter.js     |   36 +
 .../services/routing/StaticPagesRouter.js     |   60 +
 .../services/routing/StaticRoutesRouter.js    |   46 +
 .../server/services/routing/TaxonomyRouter.js |  108 ++
 core/server/services/routing/bootstrap.js     |   68 +
 .../routing/controllers/collection.js         |   54 +
 .../services/routing/controllers/entry.js     |   78 +
 .../services/routing/controllers/index.js     |   17 +
 .../services/routing/controllers/preview.js   |   42 +
 .../services/routing/controllers/rss.js       |   57 +
 .../routing/helpers}/context.js               |   10 +-
 .../routing/helpers}/error.js                 |    0
 .../services/routing/helpers/fetch-data.js    |  120 ++
 .../routing/helpers}/format-response.js       |    4 +-
 core/server/services/routing/helpers/index.js |   41 +
 .../services/routing/helpers/post-lookup.js   |   54 +
 .../routing/helpers/render-collection.js      |   12 +
 .../routing/helpers}/render-entry.js          |    9 +-
 .../routing/helpers}/renderer.js              |    3 +-
 .../routing/helpers}/secure.js                |    0
 .../routing/helpers}/templates.js             |   78 +-
 core/server/services/routing/index.js         |   21 +
 .../services/routing/middlewares/index.js     |    5 +
 .../routing/middlewares/page-param.js         |   27 +
 core/server/services/routing/registry.js      |   43 +
 core/server/services/rss/generate-feed.js     |    4 +-
 .../services/settings/default-routes.yaml     |    2 +-
 core/server/services/settings/index.js        |   19 +-
 core/server/services/settings/loader.js       |    7 +-
 core/server/services/settings/validate.js     |  205 +++
 core/server/services/slack.js                 |    2 +-
 core/server/services/url/Queue.js             |   14 +-
 core/server/services/url/Resources.js         |    8 +
 core/server/services/url/UrlGenerator.js      |   85 +-
 core/server/services/url/UrlService.js        |  132 +-
 core/server/services/url/Urls.js              |    7 +-
 core/server/services/url/index.js             |    7 +-
 core/server/services/url/utils.js             |   86 +-
 core/server/services/xmlrpc.js                |    2 +-
 core/server/translations/en.json              |    4 +-
 core/server/web/middleware/error-handler.js   |    5 +-
 core/server/web/middleware/index.js           |    5 +
 core/server/web/middleware/maintenance.js     |    9 +-
 core/server/web/site/app.js                   |    3 -
 core/server/web/site/routes.js                |   45 +-
 ...hannel_spec.js => dynamic_routing_spec.js} |  147 +-
 core/test/functional/routes/frontend_spec.js  |    2 +
 core/test/integration/api/api_posts_spec.js   |    3 +
 .../data/importer/importers/data_spec.js      |   29 +-
 .../helpers/ghost_head_spec.js                | 1290 ++++++++---------
 .../integration/model/model_posts_spec.js     |   19 +-
 .../services/url/UrlService_spec.js           |  737 ++++++++++
 core/test/integration/web/site_spec.js        | 1094 +++++++++++++-
 core/test/unit/apps/amp/router_spec.js        |  235 ++-
 core/test/unit/controllers/entry_spec.js      |  689 ---------
 .../unit/controllers/frontend/context_spec.js |  446 ------
 .../controllers/frontend/fetch-data_spec.js   |  187 ---
 .../controllers/frontend/post-lookup_spec.js  |  256 ----
 core/test/unit/controllers/preview_spec.js    |  202 ---
 core/test/unit/controllers/rss_spec.js        |  291 ----
 core/test/unit/data/meta/amp_url_spec.js      |  130 +-
 core/test/unit/data/meta/author_url_spec.js   |  150 +-
 .../test/unit/data/meta/canonical_url_spec.js |  107 +-
 .../test/unit/data/meta/paginated_url_spec.js |   14 +-
 core/test/unit/data/meta/rss_url_spec.js      |   31 +-
 core/test/unit/data/meta/url_spec.js          |  182 ++-
 .../unit/data/xml/sitemap/generator_spec.js   |  423 +++---
 .../unit/data/xml/sitemap/manager_spec.js     |  305 +---
 core/test/unit/helpers/author_spec.js         |   52 +-
 core/test/unit/helpers/authors_spec.js        |  186 ++-
 core/test/unit/helpers/tags_spec.js           |  285 ++--
 core/test/unit/helpers/url_spec.js            |   82 +-
 core/test/unit/models/post_spec.js            |   18 +-
 core/test/unit/services/apps/proxy_spec.js    |   10 +-
 core/test/unit/services/apps/sandbox_spec.js  |   16 +-
 .../services/channels/custom_channels_spec.js |  213 ---
 .../unit/services/channels/loader_spec.js     |   45 -
 .../services/channels/parent-router_spec.js   |  500 -------
 .../services/routing/CollectionRouter_spec.js |  157 ++
 .../unit/services/routing/RSSRouter_spec.js   |   72 +
 .../routing/controllers/collection_spec.js    |  236 +++
 .../routing/controllers/entry_spec.js         |  181 +++
 .../routing/controllers/preview_spec.js       |  139 ++
 .../services/routing/controllers/rss_spec.js  |  181 +++
 .../services/routing/helpers/context_spec.js  |  302 ++++
 .../routing/helpers}/error_spec.js            |   21 +-
 .../routing/helpers/fetch-data_spec.js        |  212 +++
 .../routing/helpers}/format-response_spec.js  |   49 +-
 .../routing/helpers/post-lookup_spec.js       |  234 +++
 .../routing/helpers}/templates_spec.js        |  124 +-
 .../routing/middlewares/page-param_spec.js    |   77 +
 .../unit/services/rss/generate-feed_spec.js   |   21 +-
 .../unit/services/settings/loader_spec.js     |    6 +-
 .../unit/services/settings/settings_spec.js   |    4 +-
 .../unit/services/settings/validate_spec.js   |  264 ++++
 .../services/settings/yaml-parser_spec.js     |    2 +-
 core/test/unit/services/slack_spec.js         |   46 +-
 .../unit/services/url/UrlGenerator_spec.js    |  129 +-
 .../test/unit/services/url/UrlService_spec.js |  845 +++--------
 core/test/unit/services/url/utils_spec.js     |  116 +-
 core/test/utils/channelUtils.js               |  165 ---
 core/test/utils/fixtures/data-generator.js    |   11 +-
 .../utils/fixtures/settings/badroutes.yaml    |    2 +-
 .../utils/fixtures/settings/goodroutes.yaml   |    2 +-
 core/test/utils/fixtures/settings/routes.yaml |   12 +
 .../fixtures/themes/test-theme/default.hbs    |    0
 .../utils/fixtures/themes/test-theme/home.hbs |    1 +
 .../fixtures/themes/test-theme/something.hbs  |    0
 core/test/utils/index.js                      |  184 ++-
 core/test/utils/mocks/express.js              |   18 +-
 core/test/utils/mocks/knex.js                 |   66 +-
 161 files changed, 8119 insertions(+), 7742 deletions(-)
 delete mode 100644 core/server/controllers/channel.js
 delete mode 100644 core/server/controllers/frontend/fetch-data.js
 delete mode 100644 core/server/controllers/frontend/post-lookup.js
 delete mode 100644 core/server/controllers/frontend/render-channel.js
 delete mode 100644 core/server/controllers/index.js
 delete mode 100644 core/server/controllers/rss.js
 delete mode 100644 core/server/data/xml/sitemap/index.js
 delete mode 100644 core/server/services/channels/Channel.js
 delete mode 100644 core/server/services/channels/Channels2.js
 delete mode 100644 core/server/services/channels/config.channels.json
 delete mode 100644 core/server/services/channels/index.js
 delete mode 100644 core/server/services/channels/loader.js
 delete mode 100644 core/server/services/channels/parent-router.js
 delete mode 100644 core/server/services/channels/router.js
 delete mode 100644 core/server/services/route/app-router.js
 delete mode 100644 core/server/services/route/index.js
 delete mode 100644 core/server/services/route/registry.js
 delete mode 100644 core/server/services/route/site-router.js
 create mode 100644 core/server/services/routing/CollectionRouter.js
 rename core/server/services/{route => routing}/ParentRouter.js (50%)
 create mode 100644 core/server/services/routing/PreviewRouter.js
 create mode 100644 core/server/services/routing/RSSRouter.js
 create mode 100644 core/server/services/routing/StaticPagesRouter.js
 create mode 100644 core/server/services/routing/StaticRoutesRouter.js
 create mode 100644 core/server/services/routing/TaxonomyRouter.js
 create mode 100644 core/server/services/routing/bootstrap.js
 create mode 100644 core/server/services/routing/controllers/collection.js
 create mode 100644 core/server/services/routing/controllers/entry.js
 create mode 100644 core/server/services/routing/controllers/index.js
 create mode 100644 core/server/services/routing/controllers/preview.js
 create mode 100644 core/server/services/routing/controllers/rss.js
 rename core/server/{controllers/frontend => services/routing/helpers}/context.js (93%)
 rename core/server/{controllers/frontend => services/routing/helpers}/error.js (100%)
 create mode 100644 core/server/services/routing/helpers/fetch-data.js
 rename core/server/{controllers/frontend => services/routing/helpers}/format-response.js (93%)
 create mode 100644 core/server/services/routing/helpers/index.js
 create mode 100644 core/server/services/routing/helpers/post-lookup.js
 create mode 100644 core/server/services/routing/helpers/render-collection.js
 rename core/server/{controllers/frontend => services/routing/helpers}/render-entry.js (70%)
 rename core/server/{controllers/frontend => services/routing/helpers}/renderer.js (83%)
 rename core/server/{controllers/frontend => services/routing/helpers}/secure.js (100%)
 rename core/server/{controllers/frontend => services/routing/helpers}/templates.js (59%)
 create mode 100644 core/server/services/routing/index.js
 create mode 100644 core/server/services/routing/middlewares/index.js
 create mode 100644 core/server/services/routing/middlewares/page-param.js
 create mode 100644 core/server/services/routing/registry.js
 create mode 100644 core/server/services/settings/validate.js
 create mode 100644 core/server/web/middleware/index.js
 rename core/test/functional/routes/{channel_spec.js => dynamic_routing_spec.js} (95%)
 rename core/test/{unit => integration}/helpers/ghost_head_spec.js (79%)
 create mode 100644 core/test/integration/services/url/UrlService_spec.js
 delete mode 100644 core/test/unit/controllers/entry_spec.js
 delete mode 100644 core/test/unit/controllers/frontend/context_spec.js
 delete mode 100644 core/test/unit/controllers/frontend/fetch-data_spec.js
 delete mode 100644 core/test/unit/controllers/frontend/post-lookup_spec.js
 delete mode 100644 core/test/unit/controllers/preview_spec.js
 delete mode 100644 core/test/unit/controllers/rss_spec.js
 delete mode 100644 core/test/unit/services/channels/custom_channels_spec.js
 delete mode 100644 core/test/unit/services/channels/loader_spec.js
 delete mode 100644 core/test/unit/services/channels/parent-router_spec.js
 create mode 100644 core/test/unit/services/routing/CollectionRouter_spec.js
 create mode 100644 core/test/unit/services/routing/RSSRouter_spec.js
 create mode 100644 core/test/unit/services/routing/controllers/collection_spec.js
 create mode 100644 core/test/unit/services/routing/controllers/entry_spec.js
 create mode 100644 core/test/unit/services/routing/controllers/preview_spec.js
 create mode 100644 core/test/unit/services/routing/controllers/rss_spec.js
 create mode 100644 core/test/unit/services/routing/helpers/context_spec.js
 rename core/test/unit/{controllers/frontend => services/routing/helpers}/error_spec.js (64%)
 create mode 100644 core/test/unit/services/routing/helpers/fetch-data_spec.js
 rename core/test/unit/{controllers/frontend => services/routing/helpers}/format-response_spec.js (57%)
 create mode 100644 core/test/unit/services/routing/helpers/post-lookup_spec.js
 rename core/test/unit/{controllers/frontend => services/routing/helpers}/templates_spec.js (82%)
 create mode 100644 core/test/unit/services/routing/middlewares/page-param_spec.js
 create mode 100644 core/test/unit/services/settings/validate_spec.js
 delete mode 100644 core/test/utils/channelUtils.js
 create mode 100644 core/test/utils/fixtures/settings/routes.yaml
 create mode 100644 core/test/utils/fixtures/themes/test-theme/default.hbs
 create mode 100644 core/test/utils/fixtures/themes/test-theme/home.hbs
 create mode 100644 core/test/utils/fixtures/themes/test-theme/something.hbs

diff --git a/content/settings/README.md b/content/settings/README.md
index 480ae78be3..eaaad52042 100644
--- a/content/settings/README.md
+++ b/content/settings/README.md
@@ -11,7 +11,7 @@ routes:
 
 collections:
   /:
-    route: '{globals.permalinks}'
+    permalink: '{globals.permalinks}'
     template:
       - home
       - index
diff --git a/core/server/api/db.js b/core/server/api/db.js
index 566a7227ec..d02dce8deb 100644
--- a/core/server/api/db.js
+++ b/core/server/api/db.js
@@ -107,7 +107,7 @@ db = {
      */
     deleteAllContent: function deleteAllContent(options) {
         var tasks,
-            queryOpts = {columns: 'id', context: {internal: true}};
+            queryOpts = {columns: 'id', context: {internal: true}, destroyAll: true};
 
         options = options || {};
 
diff --git a/core/server/apps/amp/lib/router.js b/core/server/apps/amp/lib/router.js
index d8d68c76a5..f110ba1657 100644
--- a/core/server/apps/amp/lib/router.js
+++ b/core/server/apps/amp/lib/router.js
@@ -4,9 +4,8 @@ var path = require('path'),
 
     // Dirty requires
     common = require('../../../lib/common'),
-    postLookup = require('../../../controllers/frontend/post-lookup'),
-    renderer = require('../../../controllers/frontend/renderer'),
-
+    urlService = require('../../../services/url'),
+    helpers = require('../../../services/routing/helpers'),
     templateName = 'amp';
 
 function _renderer(req, res, next) {
@@ -28,7 +27,7 @@ function _renderer(req, res, next) {
     }
 
     // Render Call
-    return renderer(req, res, data);
+    return helpers.renderer(req, res, data);
 }
 
 // This here is a controller.
@@ -36,7 +35,38 @@ function _renderer(req, res, next) {
 function getPostData(req, res, next) {
     req.body = req.body || {};
 
-    postLookup(res.locals.relativeUrl)
+    const urlWithSubdirectoryWithoutAmp = req.originalUrl.match(/(.*?\/)amp/)[1];
+    const urlWithoutSubdirectoryWithoutAmp = res.locals.relativeUrl.match(/(.*?\/)amp/)[1];
+
+    /**
+     * @NOTE
+     *
+     * We have to figure out the target permalink, otherwise it would be possible to serve a post
+     * which lives in two collections.
+     *
+     * @TODO:
+     *
+     * This is not optimal and caused by the fact how apps currently work. But apps weren't designed
+     * for dynamic routing.
+     *
+     * I think if the responsible, target router would first take care fetching/determining the post, the
+     * request could then be forwarded to this app. Then we don't have to:
+     *
+     * 1. care about fetching the post
+     * 2. care about if the post can be served
+     * 3. then this app would act like an extension
+     *
+     * The challenge is to design different types of apps e.g. extensions of routers, standalone pages etc.
+     */
+    const permalinks = urlService.getPermalinkByUrl(urlWithSubdirectoryWithoutAmp, {withUrlOptions: true});
+
+    if (!permalinks) {
+        return next(new common.errors.NotFoundError({
+            message: common.i18n.t('errors.errors.pageNotFound')
+        }));
+    }
+
+    helpers.postLookup(urlWithoutSubdirectoryWithoutAmp, {permalinks: permalinks})
         .then(function handleResult(result) {
             if (result && result.post) {
                 req.body.post = result.post;
diff --git a/core/server/apps/private-blogging/lib/router.js b/core/server/apps/private-blogging/lib/router.js
index be1c2fbdac..465730fd6d 100644
--- a/core/server/apps/private-blogging/lib/router.js
+++ b/core/server/apps/private-blogging/lib/router.js
@@ -1,12 +1,10 @@
-var path                = require('path'),
-    express             = require('express'),
-    middleware          = require('./middleware'),
-    bodyParser          = require('body-parser'),
-    renderer            = require('../../../controllers/frontend/renderer'),
-    brute               = require('../../../web/middleware/brute'),
-
+const path = require('path'),
+    express = require('express'),
+    middleware = require('./middleware'),
+    bodyParser = require('body-parser'),
+    routing = require('../../../services/routing'),
+    brute = require('../../../web/middleware/brute'),
     templateName = 'private',
-
     privateRouter = express.Router();
 
 function _renderer(req, res) {
@@ -27,7 +25,7 @@ function _renderer(req, res) {
     }
 
     // Render Call
-    return renderer(req, res, data);
+    return routing.helpers.renderer(req, res, data);
 }
 
 // password-protected frontend route
diff --git a/core/server/apps/subscribers/lib/helpers/subscribe_form.js b/core/server/apps/subscribers/lib/helpers/subscribe_form.js
index 2c78bc5c6d..d6c3352984 100644
--- a/core/server/apps/subscribers/lib/helpers/subscribe_form.js
+++ b/core/server/apps/subscribers/lib/helpers/subscribe_form.js
@@ -5,7 +5,7 @@ var _ = require('lodash'),
     // (Less) dirty requires
     proxy = require('../../../../helpers/proxy'),
     templates = proxy.templates,
-    url = proxy.url,
+    urlService = proxy.urlService,
     SafeString = proxy.SafeString,
 
     params = ['error', 'success', 'email'],
@@ -39,7 +39,7 @@ module.exports = function subscribe_form(options) { // eslint-disable-line camel
     var root = options.data.root,
         data = _.merge({}, options.hash, _.pick(root, params), {
             // routeKeywords.subscribe: 'subscribe'
-            action: url.urlJoin('/', url.getSubdir(), 'subscribe/'),
+            action: urlService.utils.urlJoin('/', urlService.utils.getSubdir(), 'subscribe/'),
             script: new SafeString(subscribeScript),
             hidden: new SafeString(
                 makeHidden('confirm') +
diff --git a/core/server/apps/subscribers/lib/router.js b/core/server/apps/subscribers/lib/router.js
index 209f849c0a..620c95b67f 100644
--- a/core/server/apps/subscribers/lib/router.js
+++ b/core/server/apps/subscribers/lib/router.js
@@ -7,9 +7,9 @@ var path = require('path'),
     // Dirty requires
     api = require('../../../api'),
     common = require('../../../lib/common'),
+    urlService = require('../../../services/url'),
     validator = require('../../../data/validation').validator,
-    postLookup = require('../../../controllers/frontend/post-lookup'),
-    renderer = require('../../../controllers/frontend/renderer'),
+    routing = require('../../../services/routing'),
 
     templateName = 'subscribe';
 
@@ -27,7 +27,7 @@ function _renderer(req, res) {
     var data = req.body;
 
     // Render Call
-    return renderer(req, res, data);
+    return routing.helpers.renderer(req, res, data);
 }
 
 /**
@@ -63,24 +63,17 @@ function santizeUrl(url) {
 function handleSource(req, res, next) {
     req.body.subscribed_url = santizeUrl(req.body.location);
     req.body.subscribed_referrer = santizeUrl(req.body.referrer);
+
     delete req.body.location;
     delete req.body.referrer;
 
-    postLookup(req.body.subscribed_url)
-        .then(function (result) {
-            if (result && result.post) {
-                req.body.post_id = result.post.id;
-            }
+    const resource = urlService.getResource(urlService.utils.absoluteToRelative(req.body.subscribed_url));
 
-            next();
-        })
-        .catch(function (err) {
-            if (err instanceof common.errors.NotFoundError) {
-                return next();
-            }
+    if (resource) {
+        req.body.post_id = resource.data.id;
+    }
 
-            next(err);
-        });
+    next();
 }
 
 function storeSubscriber(req, res, next) {
diff --git a/core/server/controllers/channel.js b/core/server/controllers/channel.js
deleted file mode 100644
index 7d5a28ec99..0000000000
--- a/core/server/controllers/channel.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var _ = require('lodash'),
-    common = require('../lib/common'),
-    security = require('../lib/security'),
-    filters = require('../filters'),
-    handleError = require('./frontend/error'),
-    fetchData = require('./frontend/fetch-data'),
-    setRequestIsSecure = require('./frontend/secure'),
-    renderChannel = require('./frontend/render-channel');
-
-// This here is a controller.
-// The "route" is handled in services/channels/router.js
-// There's both a top-level channelS router, and an individual channel one
-module.exports = function channelController(req, res, next) {
-    // Parse the parameters we need from the URL
-    var pageParam = req.params.page !== undefined ? req.params.page : 1,
-        slugParam = req.params.slug ? security.string.safe(req.params.slug) : undefined;
-
-    // @TODO: fix this, we shouldn't change the channel object!
-    // Set page on postOptions for the query made later
-    res.locals.channel.postOptions.page = pageParam;
-    res.locals.channel.slugParam = slugParam;
-
-    // Call fetchData to get everything we need from the API
-    return fetchData(res.locals.channel).then(function handleResult(result) {
-        // If page is greater than number of pages we have, go straight to 404
-        if (pageParam > result.meta.pagination.pages) {
-            return next(new common.errors.NotFoundError({message: common.i18n.t('errors.errors.pageNotFound')}));
-        }
-
-        // Format data 1
-        // @TODO: figure out if this can be removed, it's supposed to ensure that absolutely URLs get generated
-        // correctly for the various objects, but I believe it doesn't work and a different approach is needed.
-        setRequestIsSecure(req, result.posts);
-        _.each(result.data, function (data) {
-            setRequestIsSecure(req, data);
-        });
-
-        // @TODO: properly design these filters
-        filters.doFilter('prePostsRender', result.posts, res.locals)
-            .then(function (posts) {
-                result.posts = posts;
-                return result;
-            })
-            .then(renderChannel(req, res));
-    }).catch(handleError(next));
-};
diff --git a/core/server/controllers/entry.js b/core/server/controllers/entry.js
index 352ea21b33..40f6ad6d8d 100644
--- a/core/server/controllers/entry.js
+++ b/core/server/controllers/entry.js
@@ -34,8 +34,20 @@ module.exports = function entryController(req, res, next) {
             return urlService.utils.redirectToAdmin(302, res, '/editor/' + post.id);
         }
 
-        // CASE: permalink is not valid anymore, we redirect him permanently to the correct one
-        if (post.url !== req.path) {
+        //
+        /**
+         * CASE: Permalink is not valid anymore, we redirect him permanently to the correct one
+         *       This usually only happens if you switch to date permalinks or if you have date permalinks
+         *       enabled and the published date changes.
+         *
+         * @NOTE
+         *
+         * The resource url (post.url) always contains the subdirectory. This was different before dynamic routing.
+         * Because with dynamic routing we have a service which knows where a resource lives - and this includes the
+         * subdirectory. Otherwise every time we use a resource url, we would need to take care of the subdirectory.
+         * That's why we have to use the original url, which contains the sub-directory.
+         */
+        if (post.url !== req.originalUrl) {
             return urlService.utils.redirect301(res, post.url);
         }
 
diff --git a/core/server/controllers/frontend/fetch-data.js b/core/server/controllers/frontend/fetch-data.js
deleted file mode 100644
index 9dffc254f0..0000000000
--- a/core/server/controllers/frontend/fetch-data.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * # Fetch Data
- * Dynamically build and execute queries on the API for channels
- */
-var api = require('../../api'),
-    _ = require('lodash'),
-    Promise = require('bluebird'),
-    themes = require('../../services/themes'),
-    queryDefaults,
-    defaultPostQuery = {};
-
-// The default settings for a default post query
-queryDefaults = {
-    type: 'browse',
-    resource: 'posts',
-    options: {}
-};
-
-/**
- * Default post query needs to always include author, authors & tags
- *
- * @deprecated: `author`, will be removed in Ghost 2.0
- */
-_.extend(defaultPostQuery, queryDefaults, {
-    options: {
-        include: 'author,authors,tags'
-    }
-});
-
-/**
- * ## Fetch Posts Per page
- * Grab the postsPerPage setting
- *
- * @param {Object} options
- * @returns {Object} postOptions
- */
-function fetchPostsPerPage(options) {
-    options = options || {};
-
-    var postsPerPage = parseInt(themes.getActive().config('posts_per_page'));
-
-    // No negative posts per page, must be number
-    if (!isNaN(postsPerPage) && postsPerPage > 0) {
-        options.limit = postsPerPage;
-    }
-
-    // Ensure the options key is present, so this can be merged with other options
-    return {options: options};
-}
-
-/**
- * @typedef query
- * @
- */
-
-/**
- * ## Process Query
- * Takes a 'query' object, ensures that type, resource and options are set
- * Replaces occurrences of `%s` in options with slugParam
- * Converts the query config to a promise for the result
- *
- * @param {{type: String, resource: String, options: Object}} query
- * @param {String} slugParam
- * @returns {Promise} promise for an API call
- */
-function processQuery(query, slugParam) {
-    query = _.cloneDeep(query);
-
-    // Ensure that all the properties are filled out
-    _.defaultsDeep(query, queryDefaults);
-
-    // Replace any slugs
-    _.each(query.options, function (option, name) {
-        query.options[name] = _.isString(option) ? option.replace(/%s/g, slugParam) : option;
-    });
-
-    // Return a promise for the api query
-    return api[query.resource][query.type](query.options);
-}
-
-/**
- * ## Fetch Data
- * Calls out to get posts per page, builds the final posts query & builds any additional queries
- * Wraps the queries using Promise.props to ensure it gets named responses
- * Does a first round of formatting on the response, and returns
- *
- * @param {Object} channelOptions
- * @returns {Promise} response
- */
-function fetchData(channelOptions) {
-    // @TODO improve this further
-    var pageOptions = channelOptions.isRSS ? {options: channelOptions.postOptions} : fetchPostsPerPage(channelOptions.postOptions),
-        postQuery,
-        props = {};
-
-    // All channels must have a posts query, use the default if not provided
-    postQuery = _.defaultsDeep({}, pageOptions, defaultPostQuery);
-    props.posts = processQuery(postQuery, channelOptions.slugParam);
-
-    _.each(channelOptions.data, function (query, name) {
-        props[name] = processQuery(query, channelOptions.slugParam);
-    });
-
-    return Promise.props(props).then(function formatResponse(results) {
-        var response = _.cloneDeep(results.posts);
-        delete results.posts;
-
-        // process any remaining data
-        if (!_.isEmpty(results)) {
-            response.data = {};
-
-            _.each(results, function (result, name) {
-                if (channelOptions.data[name].type === 'browse') {
-                    response.data[name] = result;
-                } else {
-                    response.data[name] = result[channelOptions.data[name].resource];
-                }
-            });
-        }
-
-        return response;
-    });
-}
-
-module.exports = fetchData;
diff --git a/core/server/controllers/frontend/post-lookup.js b/core/server/controllers/frontend/post-lookup.js
deleted file mode 100644
index 7292feb71d..0000000000
--- a/core/server/controllers/frontend/post-lookup.js
+++ /dev/null
@@ -1,73 +0,0 @@
-var _          = require('lodash'),
-    Promise    = require('bluebird'),
-    url        = require('url'),
-    routeMatch = require('path-match')(),
-    api        = require('../../api'),
-    settingsCache = require('../../services/settings/cache'),
-    optionsFormat = '/:options?';
-
-function getOptionsFormat(linkStructure) {
-    return linkStructure.replace(/\/$/, '') + optionsFormat;
-}
-
-function postLookup(postUrl) {
-    var postPath = url.parse(postUrl).path,
-        postPermalink = settingsCache.get('permalinks'),
-        pagePermalink = '/:slug/',
-        isEditURL = false,
-        matchFuncPost,
-        matchFuncPage,
-        postParams,
-        params;
-
-    // Convert saved permalink into a path-match function
-    matchFuncPost = routeMatch(getOptionsFormat(postPermalink));
-    matchFuncPage = routeMatch(getOptionsFormat(pagePermalink));
-
-    postParams = matchFuncPost(postPath);
-
-    // Check if the path matches the permalink structure.
-    // If there are no matches found, test to see if this is a page instead
-    params = postParams || matchFuncPage(postPath);
-
-    // if there are no matches for either then return empty
-    if (params === false) {
-        return Promise.resolve();
-    }
-
-    // If params contains options, and it is equal to 'edit', this is an edit URL
-    if (params.options && params.options.toLowerCase() === 'edit') {
-        isEditURL = true;
-    }
-
-    /**
-     * Query database to find post.
-     *
-     * @deprecated: `author`, will be removed in Ghost 2.0
-     */
-    return api.posts.read(_.extend(_.pick(params, 'slug', 'id'), {include: 'author,authors,tags'})).then(function then(result) {
-        var post = result.posts[0];
-
-        if (!post) {
-            return Promise.resolve();
-        }
-
-        // CASE: we originally couldn't match the post based on date permalink and we tried to check if its a page
-        if (!post.page && !postParams) {
-            return Promise.resolve();
-        }
-
-        // CASE: we only support /:slug format for pages
-        if (post.page && matchFuncPage(postPath) === false) {
-            return Promise.resolve();
-        }
-
-        return {
-            post: post,
-            isEditURL: isEditURL,
-            isUnknownOption: isEditURL ? false : params.options ? true : false
-        };
-    });
-}
-
-module.exports = postLookup;
diff --git a/core/server/controllers/frontend/render-channel.js b/core/server/controllers/frontend/render-channel.js
deleted file mode 100644
index f367d94031..0000000000
--- a/core/server/controllers/frontend/render-channel.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var debug = require('ghost-ignition').debug('channels:render'),
-    formatResponse = require('./format-response'),
-    renderer = require('./renderer');
-
-module.exports = function renderChannel(req, res) {
-    debug('renderChannel called');
-    return function renderChannel(result) {
-        // Renderer begin
-        // Format data 2
-        // Do final data formatting and then render
-        var data = formatResponse.channel(result);
-
-        // Render Call
-        return renderer(req, res, data);
-    };
-};
diff --git a/core/server/controllers/index.js b/core/server/controllers/index.js
deleted file mode 100644
index 2487ee4622..0000000000
--- a/core/server/controllers/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = {
-    preview: require('./preview'),
-    entry: require('./entry')
-};
diff --git a/core/server/controllers/preview.js b/core/server/controllers/preview.js
index 534332f770..db5c2cd9d3 100644
--- a/core/server/controllers/preview.js
+++ b/core/server/controllers/preview.js
@@ -37,7 +37,7 @@ module.exports = function previewController(req, res, next) {
         }
 
         if (post.status === 'published') {
-            return urlService.utils.redirect301(res, urlService.utils.urlFor('post', {post: post}));
+            return urlService.utils.redirect301(res, urlService.getUrlByResourceId(post.id));
         }
 
         setRequestIsSecure(req, post);
diff --git a/core/server/controllers/rss.js b/core/server/controllers/rss.js
deleted file mode 100644
index 3f0c015cef..0000000000
--- a/core/server/controllers/rss.js
+++ /dev/null
@@ -1,70 +0,0 @@
-var _ = require('lodash'),
-    url = require('url'),
-    common = require('../lib/common'),
-    security = require('../lib/security'),
-    settingsCache = require('../services/settings/cache'),
-
-    // Slightly less ugly temporary hack for location of things
-    fetchData = require('./frontend/fetch-data'),
-    handleError = require('./frontend/error'),
-
-    rssService = require('../services/rss'),
-    generate;
-
-// @TODO: is this the right logic? Where should this live?!
-function getBaseUrlForRSSReq(originalUrl, pageParam) {
-    return url.parse(originalUrl).pathname.replace(new RegExp('/' + pageParam + '/$'), '/');
-}
-
-// @TODO: is this really correct? Should we be using meta data title?
-function getTitle(relatedData) {
-    relatedData = relatedData || {};
-    var titleStart = _.get(relatedData, 'author[0].name') || _.get(relatedData, 'tag[0].name') || '';
-
-    titleStart += titleStart ? ' - ' : '';
-    return titleStart + settingsCache.get('title');
-}
-
-// @TODO: merge this with the rest of the data processing for RSS
-// @TODO: swap the fetchData call + duplicate code from channels with something DRY
-function getData(channelOpts) {
-    channelOpts.data = channelOpts.data || {};
-
-    return fetchData(channelOpts).then(function formatResult(result) {
-        var response = _.pick(result, ['posts', 'meta']);
-
-        response.title = getTitle(result.data);
-        response.description = settingsCache.get('description');
-
-        return response;
-    });
-}
-
-// This here is a controller.
-// The "route" is handled in services/channels/router.js
-// We can only generate RSS for channels, so that sorta makes sense, but the location is rubbish
-// @TODO finish refactoring this - it's now a controller
-generate = function generate(req, res, next) {
-    // Parse the parameters we need from the URL
-    var pageParam = req.params.page !== undefined ? req.params.page : 1,
-        slugParam = req.params.slug ? security.string.safe(req.params.slug) : undefined,
-        // Base URL needs to be the URL for the feed without pagination:
-        baseUrl = getBaseUrlForRSSReq(req.originalUrl, pageParam);
-
-    // @TODO: fix this, we shouldn't change the channel object!
-    // Set page on postOptions for the query made later
-    res.locals.channel.postOptions.page = pageParam;
-    res.locals.channel.slugParam = slugParam;
-
-    return getData(res.locals.channel).then(function handleResult(data) {
-        // If page is greater than number of pages we have, go straight to 404
-        if (pageParam > data.meta.pagination.pages) {
-            return next(new common.errors.NotFoundError({message: common.i18n.t('errors.errors.pageNotFound')}));
-        }
-
-        // Render call - to a special RSS renderer
-        return rssService.render(res, baseUrl, data);
-    }).catch(handleError(next));
-};
-
-module.exports = generate;
diff --git a/core/server/data/meta/author_url.js b/core/server/data/meta/author_url.js
index a7aa3a91c3..fc39d8702d 100644
--- a/core/server/data/meta/author_url.js
+++ b/core/server/data/meta/author_url.js
@@ -6,12 +6,13 @@ function getAuthorUrl(data, absolute) {
     context = context === 'amp' ? 'post' : context;
 
     if (data.author) {
-        return urlService.utils.urlFor('author', {author: data.author}, absolute);
+        return urlService.getUrlByResourceId(data.author.id, {absolute: absolute, secure: data.author.secure});
     }
 
     if (data[context] && data[context].primary_author) {
-        return urlService.utils.urlFor('author', {author: data[context].primary_author}, absolute);
+        return urlService.getUrlByResourceId(data[context].primary_author.id, {absolute: absolute, secure: data[context].secure});
     }
+
     return null;
 }
 
diff --git a/core/server/data/meta/rss_url.js b/core/server/data/meta/rss_url.js
index 5d0e5d2427..fe4c7c3fd0 100644
--- a/core/server/data/meta/rss_url.js
+++ b/core/server/data/meta/rss_url.js
@@ -1,7 +1,21 @@
-var urlService = require('../../services/url');
+const routingService = require('../../services/routing');
 
+/**
+ * https://github.com/TryGhost/Team/issues/65#issuecomment-393622816
+ *
+ * For now we output only the default rss feed link. And this is the first collection.
+ * If the first collection has rss disabled, we output nothing.
+ *
+ * @TODO: We are currently investigating this.
+ */
 function getRssUrl(data, absolute) {
-    return urlService.utils.urlFor('rss', {secure: data.secure}, absolute);
+    return routingService
+        .registry
+        .getFirstCollectionRouter()
+        .getRssUrl({
+            secure: data.secure,
+            absolute: absolute
+        });
 }
 
 module.exports = getRssUrl;
diff --git a/core/server/data/meta/url.js b/core/server/data/meta/url.js
index 7cc65c365c..c4c5c7a8e4 100644
--- a/core/server/data/meta/url.js
+++ b/core/server/data/meta/url.js
@@ -12,16 +12,8 @@ function sanitizeAmpUrl(url) {
 }
 
 function getUrl(data, absolute) {
-    if (schema.isPost(data)) {
-        return urlService.utils.urlFor('post', {post: data, secure: data.secure}, absolute);
-    }
-
-    if (schema.isTag(data)) {
-        return urlService.utils.urlFor('tag', {tag: data, secure: data.secure}, absolute);
-    }
-
-    if (schema.isUser(data)) {
-        return urlService.utils.urlFor('author', {author: data, secure: data.secure}, absolute);
+    if (schema.isPost(data) || schema.isTag(data) || schema.isUser(data)) {
+        return urlService.getUrlByResourceId(data.id, {secure: data.secure, absolute: absolute});
     }
 
     if (schema.isNav(data)) {
diff --git a/core/server/data/xml/sitemap/base-generator.js b/core/server/data/xml/sitemap/base-generator.js
index cb56d174e4..6a7861a48b 100644
--- a/core/server/data/xml/sitemap/base-generator.js
+++ b/core/server/data/xml/sitemap/base-generator.js
@@ -1,77 +1,28 @@
-var _ = require('lodash'),
+const _ = require('lodash'),
     xml = require('xml'),
     moment = require('moment'),
-    Promise = require('bluebird'),
     path = require('path'),
     urlService = require('../../../services/url'),
-    common = require('../../../lib/common'),
     localUtils = require('./utils'),
-    CHANGE_FREQ = 'weekly',
-    XMLNS_DECLS;
+    CHANGE_FREQ = 'weekly';
 
 // Sitemap specific xml namespace declarations that should not change
-XMLNS_DECLS = {
+const XMLNS_DECLS = {
     _attr: {
         xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9',
         'xmlns:image': 'http://www.google.com/schemas/sitemap-image/1.1'
     }
 };
 
-function BaseSiteMapGenerator() {
-    this.lastModified = 0;
-    this.nodeLookup = {};
-    this.nodeTimeLookup = {};
-    this.siteMapContent = '';
-    this.dataEvents = common.events;
-}
+class BaseSiteMapGenerator {
+    constructor() {
+        this.nodeLookup = {};
+        this.nodeTimeLookup = {};
+        this.siteMapContent = null;
+        this.lastModified = 0;
+    }
 
-_.extend(BaseSiteMapGenerator.prototype, {
-    init: function () {
-        var self = this;
-        return this.refreshAll().then(function () {
-            return self.bindEvents();
-        });
-    },
-
-    bindEvents: _.noop,
-
-    getData: function () {
-        return Promise.resolve([]);
-    },
-
-    refreshAll: function () {
-        var self = this;
-
-        // Load all data
-        return this.getData().then(function (data) {
-            // Generate SiteMap from data
-            return self.generateXmlFromData(data);
-        }).then(function (generatedXml) {
-            self.siteMapContent = generatedXml;
-        });
-    },
-
-    generateXmlFromData: function (data) {
-        // Create all the url elements in JSON
-        var self = this,
-            nodes;
-
-        nodes = _.reduce(data, function (nodeArr, datum) {
-            var node = self.createUrlNodeFromDatum(datum);
-
-            if (node) {
-                self.updateLastModified(datum);
-                self.updateLookups(datum, node);
-                nodeArr.push(node);
-            }
-
-            return nodeArr;
-        }, []);
-
-        return this.generateXmlFromNodes(nodes);
-    },
-
-    generateXmlFromNodes: function () {
+    generateXmlFromNodes() {
         var self = this,
             // Get a mapping of node to timestamp
             timedNodes = _.map(this.nodeLookup, function (node, id) {
@@ -93,70 +44,46 @@ _.extend(BaseSiteMapGenerator.prototype, {
 
         // Return the xml
         return localUtils.getDeclarations() + xml(data);
-    },
+    }
 
-    updateXmlFromNodes: function (urlElements) {
-        var content = this.generateXmlFromNodes(urlElements);
-
-        this.setSiteMapContent(content);
-
-        return content;
-    },
-
-    addOrUpdateUrl: function (model) {
-        var datum = model.toJSON(),
-            node = this.createUrlNodeFromDatum(datum);
+    addUrl(url, datum) {
+        const node = this.createUrlNodeFromDatum(url, datum);
 
         if (node) {
             this.updateLastModified(datum);
-            // TODO: Check if the node values changed, and if not don't regenerate
             this.updateLookups(datum, node);
-            this.updateXmlFromNodes();
+            // force regeneration of xml
+            this.siteMapContent = null;
         }
-    },
+    }
 
-    removeUrl: function (model) {
-        var datum = model.toJSON();
-        // When the model is destroyed we need to fetch previousAttributes
-        if (!datum.id) {
-            datum = model.previousAttributes();
-        }
+    removeUrl(url, datum) {
         this.removeFromLookups(datum);
 
+        // force regeneration of xml
+        this.siteMapContent = null;
         this.lastModified = Date.now();
+    }
 
-        this.updateXmlFromNodes();
-    },
-
-    validateDatum: function () {
-        return true;
-    },
-
-    getUrlForDatum: function () {
-        return urlService.utils.urlFor('home', true);
-    },
-
-    getUrlForImage: function (image) {
-        return urlService.utils.urlFor('image', {image: image}, true);
-    },
-
-    getPriorityForDatum: function () {
+    getPriorityForDatum() {
         return 1.0;
-    },
+    }
 
-    getLastModifiedForDatum: function (datum) {
+    getLastModifiedForDatum(datum) {
         return datum.updated_at || datum.published_at || datum.created_at;
-    },
+    }
 
-    createUrlNodeFromDatum: function (datum) {
-        if (!this.validateDatum(datum)) {
-            return false;
+    updateLastModified(datum) {
+        const lastModified = this.getLastModifiedForDatum(datum);
+
+        if (lastModified > this.lastModified) {
+            this.lastModified = lastModified;
         }
+    }
 
-        var url = this.getUrlForDatum(datum),
-            priority = this.getPriorityForDatum(datum),
-            node,
-            imgNode;
+    createUrlNodeFromDatum(url, datum) {
+        const priority = this.getPriorityForDatum(datum);
+        let node, imgNode;
 
         node = {
             url: [
@@ -174,9 +101,9 @@ _.extend(BaseSiteMapGenerator.prototype, {
         }
 
         return node;
-    },
+    }
 
-    createImageNodeFromDatum: function (datum) {
+    createImageNodeFromDatum(datum) {
         // Check for cover first because user has cover but the rest only have image
         var image = datum.cover_image || datum.profile_image || datum.feature_image,
             imageUrl,
@@ -187,7 +114,7 @@ _.extend(BaseSiteMapGenerator.prototype, {
         }
 
         // Grab the image url
-        imageUrl = this.getUrlForImage(image);
+        imageUrl = urlService.utils.urlFor('image', {image: image}, true);
 
         // Verify the url structure
         if (!this.validateImageUrl(imageUrl)) {
@@ -204,36 +131,37 @@ _.extend(BaseSiteMapGenerator.prototype, {
         return {
             'image:image': imageEl
         };
-    },
+    }
 
-    validateImageUrl: function (imageUrl) {
+    validateImageUrl(imageUrl) {
         return !!imageUrl;
-    },
+    }
 
-    setSiteMapContent: function (content) {
-        this.siteMapContent = content;
-    },
-
-    updateLastModified: function (datum) {
-        var lastModified = this.getLastModifiedForDatum(datum);
-
-        if (lastModified > this.lastModified) {
-            this.lastModified = lastModified;
+    getXml() {
+        if (this.siteMapContent) {
+            return this.siteMapContent;
         }
-    },
 
-    updateLookups: function (datum, node) {
+        const content = this.generateXmlFromNodes();
+        this.siteMapContent = content;
+        return content;
+    }
+
+    /**
+     * @NOTE
+     * The url service currently has no url update event.
+     * It removes and adds the url. If the url service extends it's
+     * feature set, we can detect if a node has changed.
+     */
+    updateLookups(datum, node) {
         this.nodeLookup[datum.id] = node;
         this.nodeTimeLookup[datum.id] = this.getLastModifiedForDatum(datum);
-    },
-
-    removeFromLookups: function (datum) {
-        var lookup = this.nodeLookup;
-        delete lookup[datum.id];
-
-        lookup = this.nodeTimeLookup;
-        delete lookup[datum.id];
     }
-});
+
+    removeFromLookups(datum) {
+        delete this.nodeLookup[datum.id];
+        delete this.nodeTimeLookup[datum.id];
+    }
+}
 
 module.exports = BaseSiteMapGenerator;
diff --git a/core/server/data/xml/sitemap/handler.js b/core/server/data/xml/sitemap/handler.js
index ce7073ec0b..4f68430502 100644
--- a/core/server/data/xml/sitemap/handler.js
+++ b/core/server/data/xml/sitemap/handler.js
@@ -1,66 +1,35 @@
-var _       = require('lodash'),
-    config  = require('../../../config'),
-    sitemap = require('./index');
+const config  = require('../../../config'),
+    Manager = require('./manager'),
+    manager = new Manager();
 
 // Responsible for handling requests for sitemap files
 module.exports = function handler(siteApp) {
-    var resourceTypes = ['posts', 'authors', 'tags', 'pages'],
-        verifyResourceType = function verifyResourceType(req, res, next) {
-            if (!_.includes(resourceTypes, req.params.resource)) {
-                return res.sendStatus(404);
-            }
+    const verifyResourceType = function verifyResourceType(req, res, next) {
+        if (!manager.hasOwnProperty(req.params.resource)) {
+            return res.sendStatus(404);
+        }
 
-            next();
-        },
-        getResourceSiteMapXml = function getResourceSiteMapXml(type, page) {
-            return sitemap.getSiteMapXml(type, page);
-        };
-
-    siteApp.get('/sitemap.xml', function sitemapXML(req, res, next) {
-        var siteMapXml = sitemap.getIndexXml();
+        next();
+    };
 
+    siteApp.get('/sitemap.xml', function sitemapXML(req, res) {
         res.set({
             'Cache-Control': 'public, max-age=' + config.get('caching:sitemap:maxAge'),
             'Content-Type': 'text/xml'
         });
 
-        // CASE: returns null if sitemap is not initialized as below
-        if (!siteMapXml) {
-            sitemap.init()
-                .then(function () {
-                    siteMapXml = sitemap.getIndexXml();
-                    res.send(siteMapXml);
-                })
-                .catch(function (err) {
-                    next(err);
-                });
-        } else {
-            res.send(siteMapXml);
-        }
+        res.send(manager.getIndexXml());
     });
 
-    siteApp.get('/sitemap-:resource.xml', verifyResourceType, function sitemapResourceXML(req, res, next) {
+    siteApp.get('/sitemap-:resource.xml', verifyResourceType, function sitemapResourceXML(req, res) {
         var type = req.params.resource,
-            page = 1,
-            siteMapXml = getResourceSiteMapXml(type, page);
+            page = 1;
 
         res.set({
             'Cache-Control': 'public, max-age=' + config.get('caching:sitemap:maxAge'),
             'Content-Type': 'text/xml'
         });
 
-        // CASE: returns null if sitemap is not initialized
-        if (!siteMapXml) {
-            sitemap.init()
-                .then(function () {
-                    siteMapXml = getResourceSiteMapXml(type, page);
-                    res.send(siteMapXml);
-                })
-                .catch(function (err) {
-                    next(err);
-                });
-        } else {
-            res.send(siteMapXml);
-        }
+        res.send(manager.getSiteMapXml(type, page));
     });
 };
diff --git a/core/server/data/xml/sitemap/index-generator.js b/core/server/data/xml/sitemap/index-generator.js
index 120bb46c36..16d50db178 100644
--- a/core/server/data/xml/sitemap/index-generator.js
+++ b/core/server/data/xml/sitemap/index-generator.js
@@ -1,27 +1,23 @@
-var _       = require('lodash'),
-    xml     = require('xml'),
-    moment  = require('moment'),
+const _ = require('lodash'),
+    xml = require('xml'),
+    moment = require('moment'),
     urlService = require('../../../services/url'),
-    localUtils   = require('./utils'),
-    RESOURCES,
-    XMLNS_DECLS;
+    localUtils = require('./utils');
 
-RESOURCES = ['pages', 'posts', 'authors', 'tags'];
-
-XMLNS_DECLS = {
+const XMLNS_DECLS = {
     _attr: {
         xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9'
     }
 };
 
-function SiteMapIndexGenerator(opts) {
-    // Grab the other site map generators from the options
-    _.extend(this, _.pick(opts, RESOURCES));
-}
+class SiteMapIndexGenerator {
+    constructor(options) {
+        options = options || {};
+        this.types = options.types;
+    }
 
-_.extend(SiteMapIndexGenerator.prototype, {
-    getIndexXml: function () {
-        var urlElements = this.generateSiteMapUrlElements(),
+    getXml() {
+        const urlElements = this.generateSiteMapUrlElements(),
             data = {
                 // Concat the elements to the _attr declaration
                 sitemapindex: [XMLNS_DECLS].concat(urlElements)
@@ -29,16 +25,12 @@ _.extend(SiteMapIndexGenerator.prototype, {
 
         // Return the xml
         return localUtils.getDeclarations() + xml(data);
-    },
+    }
 
-    generateSiteMapUrlElements: function () {
-        var self = this;
-
-        return _.map(RESOURCES, function (resourceType) {
-            var url = urlService.utils.urlFor({
-                    relativeUrl: '/sitemap-' + resourceType + '.xml'
-                }, true),
-                lastModified = self[resourceType].lastModified;
+    generateSiteMapUrlElements() {
+        return _.map(this.types, (resourceType) => {
+            var url = urlService.utils.urlFor({relativeUrl: '/sitemap-' + resourceType.name + '.xml'}, true),
+                lastModified = resourceType.lastModified;
 
             return {
                 sitemap: [
@@ -48,6 +40,6 @@ _.extend(SiteMapIndexGenerator.prototype, {
             };
         });
     }
-});
+}
 
 module.exports = SiteMapIndexGenerator;
diff --git a/core/server/data/xml/sitemap/index.js b/core/server/data/xml/sitemap/index.js
deleted file mode 100644
index be8e8651dd..0000000000
--- a/core/server/data/xml/sitemap/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var SiteMapManager = require('./manager');
-
-module.exports = new SiteMapManager();
diff --git a/core/server/data/xml/sitemap/manager.js b/core/server/data/xml/sitemap/manager.js
index 852a6bc078..5bbd5a8bb8 100644
--- a/core/server/data/xml/sitemap/manager.js
+++ b/core/server/data/xml/sitemap/manager.js
@@ -1,75 +1,73 @@
-var _       = require('lodash'),
-    Promise = require('bluebird'),
+const common = require('../../../lib/common'),
     IndexMapGenerator = require('./index-generator'),
     PagesMapGenerator = require('./page-generator'),
     PostsMapGenerator = require('./post-generator'),
     UsersMapGenerator = require('./user-generator'),
-    TagsMapGenerator  = require('./tag-generator'),
-    SiteMapManager;
+    TagsMapGenerator  = require('./tag-generator');
 
-SiteMapManager = function (opts) {
-    opts = opts || {};
+class SiteMapManager {
+    constructor(options) {
+        options = options || {};
 
-    this.initialized = false;
+        this.pages = options.pages || this.createPagesGenerator(options);
+        this.posts = options.posts || this.createPostsGenerator(options);
+        this.users = this.authors = options.authors || this.createUsersGenerator(options);
+        this.tags = options.tags || this.createTagsGenerator(options);
+        this.index = options.index || this.createIndexGenerator(options);
 
-    this.pages = opts.pages || this.createPagesGenerator(opts);
-    this.posts = opts.posts || this.createPostsGenerator(opts);
-    this.authors = opts.authors || this.createUsersGenerator(opts);
-    this.tags = opts.tags || this.createTagsGenerator(opts);
+        common.events.on('router.created', (router) => {
+            if (router.name === 'StaticRoutesRouter') {
+                this.pages.addUrl(router.getRoute({absolute: true}), {id: router.identifier, staticRoute: true});
+            }
 
-    this.index = opts.index || this.createIndexGenerator(opts);
-};
-
-_.extend(SiteMapManager.prototype, {
-    createIndexGenerator: function () {
-        return new IndexMapGenerator(_.pick(this, 'pages', 'posts', 'authors', 'tags'));
-    },
-
-    createPagesGenerator: function (opts) {
-        return new PagesMapGenerator(opts);
-    },
-
-    createPostsGenerator: function (opts) {
-        return new PostsMapGenerator(opts);
-    },
-
-    createUsersGenerator: function (opts) {
-        return new UsersMapGenerator(opts);
-    },
-
-    createTagsGenerator: function (opts) {
-        return new TagsMapGenerator(opts);
-    },
-
-    init: function () {
-        var self = this,
-            initOps = [
-                this.pages.init(),
-                this.posts.init(),
-                this.authors.init(),
-                this.tags.init()
-            ];
-
-        return Promise.all(initOps).then(function () {
-            self.initialized = true;
+            if (router.name === 'CollectionRouter') {
+                this.pages.addUrl(router.getRoute({absolute: true}), {id: router.identifier, staticRoute: false});
+            }
         });
-    },
 
-    getIndexXml: function () {
-        if (!this.initialized) {
-            return '';
-        }
+        common.events.on('url.added', (obj) => {
+            this[obj.resource.config.type].addUrl(obj.url.absolute, obj.resource.data);
+        });
 
-        return this.index.getIndexXml();
-    },
-
-    getSiteMapXml: function (type) {
-        if (!this.initialized || !this[type]) {
-            return null;
-        }
-
-        return this[type].siteMapContent;
+        common.events.on('url.removed', (obj) => {
+            this[obj.resource.config.type].removeUrl(obj.url.absolute, obj.resource.data);
+        });
     }
-});
+
+    createIndexGenerator() {
+        return new IndexMapGenerator({
+            types: {
+                pages: this.pages,
+                posts: this.posts,
+                authors: this.authors,
+                tags: this.tags
+            }
+        });
+    }
+
+    createPagesGenerator(options) {
+        return new PagesMapGenerator(options);
+    }
+
+    createPostsGenerator(options) {
+        return new PostsMapGenerator(options);
+    }
+
+    createUsersGenerator(options) {
+        return new UsersMapGenerator(options);
+    }
+
+    createTagsGenerator(options) {
+        return new TagsMapGenerator(options);
+    }
+
+    getIndexXml() {
+        return this.index.getXml();
+    }
+
+    getSiteMapXml(type) {
+        return this[type].getXml();
+    }
+}
 
 module.exports = SiteMapManager;
diff --git a/core/server/data/xml/sitemap/page-generator.js b/core/server/data/xml/sitemap/page-generator.js
index 9e04e640ca..746e491f5a 100644
--- a/core/server/data/xml/sitemap/page-generator.js
+++ b/core/server/data/xml/sitemap/page-generator.js
@@ -1,61 +1,22 @@
-var _      = require('lodash'),
-    api    = require('../../../api'),
-    urlService = require('../../../services/url'),
+const _  = require('lodash'),
     BaseMapGenerator = require('./base-generator');
 
-// A class responsible for generating a sitemap from posts and keeping it updated
-function PageMapGenerator(opts) {
-    _.extend(this, opts);
+class PageMapGenerator extends BaseMapGenerator {
+    constructor(opts) {
+        super();
 
-    BaseMapGenerator.apply(this, arguments);
+        this.name = 'pages';
+
+        _.extend(this, opts);
+    }
+
+    /**
+     * @TODO:
+     * We could influence this with priority or meta information
+     */
+    getPriorityForDatum(page) {
+        return page && page.staticRoute ? 1.0 : 0.8;
+    }
 }
 
-// Inherit from the base generator class
-_.extend(PageMapGenerator.prototype, BaseMapGenerator.prototype);
-
-_.extend(PageMapGenerator.prototype, {
-    bindEvents: function () {
-        var self = this;
-        this.dataEvents.on('page.published', self.addOrUpdateUrl.bind(self));
-        this.dataEvents.on('page.published.edited', self.addOrUpdateUrl.bind(self));
-        // Note: This is called if a published post is deleted
-        this.dataEvents.on('page.unpublished', self.removeUrl.bind(self));
-    },
-
-    getData: function () {
-        return api.posts.browse({
-            context: {
-                internal: true
-            },
-            filter: 'visibility:public',
-            status: 'published',
-            staticPages: true,
-            limit: 'all'
-        }).then(function (resp) {
-            var homePage = {
-                id: 0,
-                name: 'home'
-            };
-            return [homePage].concat(resp.posts);
-        });
-    },
-
-    validateDatum: function (datum) {
-        return datum.name === 'home' || (datum.page === true && datum.visibility === 'public');
-    },
-
-    getUrlForDatum: function (post) {
-        if (post.id === 0 && !_.isEmpty(post.name)) {
-            return urlService.utils.urlFor(post.name, true);
-        }
-
-        return urlService.utils.urlFor('post', {post: post}, true);
-    },
-
-    getPriorityForDatum: function (post) {
-        // TODO: We could influence this with priority or meta information
-        return post && post.name === 'home' ? 1.0 : 0.8;
-    }
-});
-
 module.exports = PageMapGenerator;
diff --git a/core/server/data/xml/sitemap/post-generator.js b/core/server/data/xml/sitemap/post-generator.js
index 824cbd77bc..c7bc808ce6 100644
--- a/core/server/data/xml/sitemap/post-generator.js
+++ b/core/server/data/xml/sitemap/post-generator.js
@@ -1,58 +1,19 @@
-var _ = require('lodash'),
-    api = require('../../../api'),
-    urlService = require('../../../services/url'),
+const _ = require('lodash'),
     BaseMapGenerator = require('./base-generator');
 
-// A class responsible for generating a sitemap from posts and keeping it updated
-function PostMapGenerator(opts) {
-    _.extend(this, opts);
+class PostMapGenerator extends BaseMapGenerator {
+    constructor(opts) {
+        super();
 
-    BaseMapGenerator.apply(this, arguments);
-}
+        this.name = 'posts';
 
-// Inherit from the base generator class
-_.extend(PostMapGenerator.prototype, BaseMapGenerator.prototype);
+        _.extend(this, opts);
+    }
 
-_.extend(PostMapGenerator.prototype, {
-    bindEvents: function () {
-        var self = this;
-        this.dataEvents.on('post.published', self.addOrUpdateUrl.bind(self));
-        this.dataEvents.on('post.published.edited', self.addOrUpdateUrl.bind(self));
-        // Note: This is called if a published post is deleted
-        this.dataEvents.on('post.unpublished', self.removeUrl.bind(self));
-    },
-
-    getData: function () {
-        return api.posts.browse({
-            context: {
-                internal: true
-            },
-            filter: 'visibility:public',
-            status: 'published',
-            staticPages: false,
-            limit: 'all',
-            /**
-             * Is required for permalinks e.g. `/:author/:slug/`.
-             * @deprecated: `author`, will be removed in Ghost 2.0
-             */
-            include: 'author,tags'
-        }).then(function (resp) {
-            return resp.posts;
-        });
-    },
-
-    validateDatum: function (datum) {
-        return datum.page === false && datum.visibility === 'public';
-    },
-
-    getUrlForDatum: function (post) {
-        return urlService.utils.urlFor('post', {post: post}, true);
-    },
-
-    getPriorityForDatum: function (post) {
+    getPriorityForDatum(post) {
         // give a slightly higher priority to featured posts
         return post.featured ? 0.9 : 0.8;
     }
-});
+}
 
 module.exports = PostMapGenerator;
diff --git a/core/server/data/xml/sitemap/tag-generator.js b/core/server/data/xml/sitemap/tag-generator.js
index 57499a6203..fd80e77bd5 100644
--- a/core/server/data/xml/sitemap/tag-generator.js
+++ b/core/server/data/xml/sitemap/tag-generator.js
@@ -1,50 +1,21 @@
-var _      = require('lodash'),
-    api    = require('../../../api'),
-    urlService = require('../../../services/url'),
+const _  = require('lodash'),
     BaseMapGenerator = require('./base-generator');
 
-// A class responsible for generating a sitemap from posts and keeping it updated
-function TagsMapGenerator(opts) {
-    _.extend(this, opts);
+class TagsMapGenerator extends BaseMapGenerator {
+    constructor(opts) {
+        super();
 
-    BaseMapGenerator.apply(this, arguments);
-}
+        this.name = 'tags';
+        _.extend(this, opts);
+    }
 
-// Inherit from the base generator class
-_.extend(TagsMapGenerator.prototype, BaseMapGenerator.prototype);
-
-_.extend(TagsMapGenerator.prototype, {
-    bindEvents: function () {
-        var self = this;
-        this.dataEvents.on('tag.added', self.addOrUpdateUrl.bind(self));
-        this.dataEvents.on('tag.edited', self.addOrUpdateUrl.bind(self));
-        this.dataEvents.on('tag.deleted', self.removeUrl.bind(self));
-    },
-
-    getData: function () {
-        return api.tags.browse({
-            context: {
-                internal: true
-            },
-            filter: 'visibility:public',
-            limit: 'all'
-        }).then(function (resp) {
-            return resp.tags;
-        });
-    },
-
-    validateDatum: function (datum) {
-        return datum.visibility === 'public';
-    },
-
-    getUrlForDatum: function (tag) {
-        return urlService.utils.urlFor('tag', {tag: tag}, true);
-    },
-
-    getPriorityForDatum: function () {
-        // TODO: We could influence this with meta information
+    /**
+     * @TODO:
+     * We could influence this with priority or meta information
+     */
+    getPriorityForDatum() {
         return 0.6;
     }
-});
+}
 
 module.exports = TagsMapGenerator;
diff --git a/core/server/data/xml/sitemap/user-generator.js b/core/server/data/xml/sitemap/user-generator.js
index 17e6a7adc6..974fe67961 100644
--- a/core/server/data/xml/sitemap/user-generator.js
+++ b/core/server/data/xml/sitemap/user-generator.js
@@ -1,58 +1,26 @@
-var _      = require('lodash'),
-    api    = require('../../../api'),
-    urlService = require('../../../services/url'),
-    validator        = require('validator'),
-    BaseMapGenerator = require('./base-generator'),
-    // @TODO: figure out a way to get rid of this
-    activeStates   = ['active', 'warn-1', 'warn-2', 'warn-3', 'warn-4', 'locked'];
+const _ = require('lodash'),
+    validator = require('validator'),
+    BaseMapGenerator = require('./base-generator');
 
-// A class responsible for generating a sitemap from posts and keeping it updated
-function UserMapGenerator(opts) {
-    _.extend(this, opts);
+class UserMapGenerator extends BaseMapGenerator {
+    constructor(opts) {
+        super();
 
-    BaseMapGenerator.apply(this, arguments);
-}
+        this.name = 'authors';
+        _.extend(this, opts);
+    }
 
-// Inherit from the base generator class
-_.extend(UserMapGenerator.prototype, BaseMapGenerator.prototype);
-
-_.extend(UserMapGenerator.prototype, {
-    bindEvents: function () {
-        var self = this;
-        this.dataEvents.on('user.activated', self.addOrUpdateUrl.bind(self));
-        this.dataEvents.on('user.activated.edited', self.addOrUpdateUrl.bind(self));
-        this.dataEvents.on('user.deactivated', self.removeUrl.bind(self));
-    },
-
-    getData: function () {
-        return api.users.browse({
-            context: {
-                internal: true
-            },
-            filter: 'visibility:public',
-            status: 'active',
-            limit: 'all'
-        }).then(function (resp) {
-            return resp.users;
-        });
-    },
-
-    validateDatum: function (datum) {
-        return datum.visibility === 'public' && _.includes(activeStates, datum.status);
-    },
-
-    getUrlForDatum: function (user) {
-        return urlService.utils.urlFor('author', {author: user}, true);
-    },
-
-    getPriorityForDatum: function () {
-        // TODO: We could influence this with meta information
+    /**
+     * @TODO:
+     * We could influence this with priority or meta information
+     */
+    getPriorityForDatum() {
         return 0.6;
-    },
+    }
 
-    validateImageUrl: function (imageUrl) {
+    validateImageUrl(imageUrl) {
         return imageUrl && validator.isURL(imageUrl, {protocols: ['http', 'https'], require_protocol: true});
     }
-});
+}
 
 module.exports = UserMapGenerator;
diff --git a/core/server/helpers/author.js b/core/server/helpers/author.js
index 5119b93de9..0d6ce14e7b 100644
--- a/core/server/helpers/author.js
+++ b/core/server/helpers/author.js
@@ -9,13 +9,12 @@
 //
 // Block helper: `{{#author}}{{/author}}`
 // This is the default handlebars behaviour of dropping into the author object scope
-
-var proxy = require('./proxy'),
+const proxy = require('./proxy'),
     _ = require('lodash'),
+    urlService = require('../services/url'),
     SafeString = proxy.SafeString,
     handlebars = proxy.hbs.handlebars,
-    templates = proxy.templates,
-    url = proxy.url;
+    templates = proxy.templates;
 
 /**
  * @deprecated: will be removed in Ghost 2.0
@@ -25,13 +24,13 @@ module.exports = function author(options) {
         return handlebars.helpers.with.call(this, this.author, options);
     }
 
-    var autolink = _.isString(options.hash.autolink) && options.hash.autolink === 'false' ? false : true,
-        output = '';
+    const autolink = _.isString(options.hash.autolink) && options.hash.autolink === 'false' ? false : true;
+    let output = '';
 
     if (this.author && this.author.name) {
         if (autolink) {
             output = templates.link({
-                url: url.urlFor('author', {author: this.author}),
+                url: urlService.getUrlByResourceId(this.author.id),
                 text: _.escape(this.author.name)
             });
         } else {
diff --git a/core/server/helpers/authors.js b/core/server/helpers/authors.js
index 9e27ab7e4c..55dc13ad52 100644
--- a/core/server/helpers/authors.js
+++ b/core/server/helpers/authors.js
@@ -1,3 +1,4 @@
+'use strict';
 // # Authors Helper
 // Usage: `{{authors}}`, `{{authors separator=' - '}}`
 //
@@ -5,32 +6,32 @@
 // By default, authors are separated by commas.
 //
 // Note that the standard {{#each authors}} implementation is unaffected by this helper.
-
-var proxy = require('./proxy'),
+const proxy = require('./proxy'),
     _ = require('lodash'),
+    urlService = require('../services/url'),
     SafeString = proxy.SafeString,
     templates = proxy.templates,
-    url = proxy.url,
     models = proxy.models;
 
 module.exports = function authors(options) {
     options = options || {};
     options.hash = options.hash || {};
 
-    var autolink = !(_.isString(options.hash.autolink) && options.hash.autolink === 'false'),
+    const autolink = !(_.isString(options.hash.autolink) && options.hash.autolink === 'false'),
         separator = _.isString(options.hash.separator) ? options.hash.separator : ', ',
         prefix = _.isString(options.hash.prefix) ? options.hash.prefix : '',
         suffix = _.isString(options.hash.suffix) ? options.hash.suffix : '',
         limit = options.hash.limit ? parseInt(options.hash.limit, 10) : undefined,
+        visibilityArr = models.Base.Model.parseVisibilityString(options.hash.visibility);
+
+    let output = '',
         from = options.hash.from ? parseInt(options.hash.from, 10) : 1,
-        to = options.hash.to ? parseInt(options.hash.to, 10) : undefined,
-        visibilityArr = models.Base.Model.parseVisibilityString(options.hash.visibility),
-        output = '';
+        to = options.hash.to ? parseInt(options.hash.to, 10) : undefined;
 
     function createAuthorsList(authors) {
         function processAuthor(author) {
             return autolink ? templates.link({
-                url: url.urlFor('author', {author: author}),
+                url: urlService.getUrlByResourceId(author.id),
                 text: _.escape(author.name)
             }) : _.escape(author.name);
         }
diff --git a/core/server/helpers/img_url.js b/core/server/helpers/img_url.js
index c3882c2cd3..f047845924 100644
--- a/core/server/helpers/img_url.js
+++ b/core/server/helpers/img_url.js
@@ -8,7 +8,7 @@
 // `absolute` flag outputs absolute URL, else URL is relative.
 
 var proxy = require('./proxy'),
-    url = proxy.url;
+    urlService = proxy.urlService;
 
 module.exports = function imgUrl(attr, options) {
     // CASE: if no attribute is passed, e.g. `{{img_url}}` we show a warning
@@ -27,7 +27,7 @@ module.exports = function imgUrl(attr, options) {
     }
 
     if (attr) {
-        return url.urlFor('image', {image: attr}, absolute);
+        return urlService.utils.urlFor('image', {image: attr}, absolute);
     }
 
     // CASE: if you pass e.g. cover_image, but it is not set, then attr is null!
diff --git a/core/server/helpers/proxy.js b/core/server/helpers/proxy.js
index 4eb1a8b7e4..30415b699d 100644
--- a/core/server/helpers/proxy.js
+++ b/core/server/helpers/proxy.js
@@ -63,6 +63,6 @@ module.exports = {
     // Various utils, needs cleaning up / simplifying
     socialUrls: require('../lib/social/urls'),
     blogIcon: require('../lib/image/blog-icon'),
-    url: require('../services/url').utils,
+    urlService: require('../services/url'),
     localUtils: require('./utils')
 };
diff --git a/core/server/helpers/tags.js b/core/server/helpers/tags.js
index 411473af89..a158da009d 100644
--- a/core/server/helpers/tags.js
+++ b/core/server/helpers/tags.js
@@ -5,32 +5,32 @@
 // By default, tags are separated by commas.
 //
 // Note that the standard {{#each tags}} implementation is unaffected by this helper
-
-var proxy = require('./proxy'),
+const proxy = require('./proxy'),
     _ = require('lodash'),
+    urlService = proxy.urlService,
     SafeString = proxy.SafeString,
     templates = proxy.templates,
-    url = proxy.url,
     models = proxy.models;
 
 module.exports = function tags(options) {
     options = options || {};
     options.hash = options.hash || {};
 
-    var autolink = !(_.isString(options.hash.autolink) && options.hash.autolink === 'false'),
+    const autolink = !(_.isString(options.hash.autolink) && options.hash.autolink === 'false'),
         separator = _.isString(options.hash.separator) ? options.hash.separator : ', ',
         prefix = _.isString(options.hash.prefix) ? options.hash.prefix : '',
         suffix = _.isString(options.hash.suffix) ? options.hash.suffix : '',
         limit = options.hash.limit ? parseInt(options.hash.limit, 10) : undefined,
+        visibilityArr = models.Base.Model.parseVisibilityString(options.hash.visibility);
+
+    let output = '',
         from = options.hash.from ? parseInt(options.hash.from, 10) : 1,
-        to = options.hash.to ? parseInt(options.hash.to, 10) : undefined,
-        visibilityArr = models.Base.Model.parseVisibilityString(options.hash.visibility),
-        output = '';
+        to = options.hash.to ? parseInt(options.hash.to, 10) : undefined;
 
     function createTagList(tags) {
         function processTag(tag) {
             return autolink ? templates.link({
-                url: url.urlFor('tag', {tag: tag}),
+                url: urlService.getUrlByResourceId(tag.id),
                 text: _.escape(tag.name)
             }) : _.escape(tag.name);
         }
diff --git a/core/server/index.js b/core/server/index.js
index 785fa0da5c..831cc8e2f3 100644
--- a/core/server/index.js
+++ b/core/server/index.js
@@ -68,8 +68,6 @@ function init() {
         debug('Permissions done');
         return Promise.join(
             themes.init(),
-            // Initialize apps
-            apps.init(),
             // Initialize xmrpc ping
             xmlrpc.listen(),
             // Initialize slack ping
@@ -89,6 +87,17 @@ function init() {
         }
 
         debug('Express Apps done');
+    }).then(function () {
+        /**
+         * @NOTE:
+         *
+         * Must happen after express app bootstrapping, because we need to ensure that all
+         * routers are created and are now ready to register additional routes. In this specific case, we
+         * are waiting that the AppRouter was instantiated. And then we can register e.g. amp if enabled.
+         *
+         * If you create a published post, the url is always stronger than any app url, which is equal.
+         */
+        return apps.init();
     }).then(function () {
         parentApp.use(auth.init());
         debug('Auth done');
diff --git a/core/server/models/base/index.js b/core/server/models/base/index.js
index 8300e845d0..12569da375 100644
--- a/core/server/models/base/index.js
+++ b/core/server/models/base/index.js
@@ -122,7 +122,10 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
         if (!model.ghostEvents) {
             model.ghostEvents = [];
 
-            if (options.importing) {
+            // CASE: when importing or deleting content, lot's of model queries are happening in one transaction
+            //       lot's of model events will be triggered. we ensure we set the max listeners to infinity.
+            //       we are using `once` - we auto remove the listener afterwards
+            if (options.importing || options.destroyAll) {
                 options.transacting.setMaxListeners(0);
             }
 
@@ -1045,7 +1048,7 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
                         relation: 'posts_tags',
                         condition: ['posts_tags.tag_id', '=', 'tags.id']
                     },
-                    select: ['posts_tags.post_id as post_id'],
+                    select: ['posts_tags.post_id as post_id', 'tags.visibility'],
                     whereIn: 'posts_tags.post_id',
                     whereInKey: 'post_id',
                     orderBy: 'sort_order'
diff --git a/core/server/models/post.js b/core/server/models/post.js
index 4c3623b582..770b515405 100644
--- a/core/server/models/post.js
+++ b/core/server/models/post.js
@@ -396,30 +396,23 @@ Post = ghostBookshelf.Model.extend({
      * But the model layer is complex and needs specific fields in specific situations.
      *
      * ### url generation
-     *   - it needs the following attrs for permalinks
+     *   - @TODO: with dynamic routing, we no longer need default columns to fetch
+     *   - because with static routing Ghost generated the url on runtime and needed the following attributes:
      *     - `slug`: /:slug/
      *     - `published_at`: /:year/:slug
      *     - `author_id`: /:author/:slug, /:primary_author/:slug
-     *   - @TODO: with channels, we no longer need these
-     *     - because the url service pre-generates urls based on the resources
+     *     - now, the UrlService pre-generates urls based on the resources
      *     - you can ask `urlService.getUrlByResourceId(post.id)`
-     *   - @TODO: there is currently a bug in here
-     *     - you request `fields=title,url`
-     *     - you don't use `include=tags`
-     *     - your permalink is `/:primary_tag/:slug/`
-     *     - we won't fetch the primary tag, ends in `url = /all/my-slug/`
-     *     - will be auto fixed when merging channels
-     *   - url generator when using `findAll` or `findOne` doesn't work either when using e.g. `columns: title`
-     *      - this is because both functions don't make use of `defaultColumnsToFetch`
-     *      - will be auto fixed when merging channels
      *
      * ### events
      *   - you call `findAll` with `columns: id`
-     *   - then you trigger `post.save()`
+     *   - then you trigger `post.save()` on the response
      *   - bookshelf events (`onSaving`) and model events (`emitChange`) are triggered
-     *   - @TODO: we need to disallow this
+     *   - but you only fetched the id column, this will trouble (!), because the event hooks require more
+     *     data than just the id
+     *   - @TODO: we need to disallow this (!)
      *   - you should use `models.Post.edit(..)`
-     *   - editing resources denies `columns`
+     *      - this disallows using the `columns` option
      *   - same for destroy - you should use `models.Post.destroy(...)`
      *
      * @IMPORTANT: This fn should **never** be used when updating models (models.Post.edit)!
@@ -466,7 +459,7 @@ Post = ghostBookshelf.Model.extend({
         }
 
         if (!options.columns || (options.columns && options.columns.indexOf('url') > -1)) {
-            attrs.url = urlService.utils.urlPathForPost(attrs);
+            attrs.url = urlService.getUrlByResourceId(attrs.id);
         }
 
         if (oldPostId) {
@@ -577,7 +570,8 @@ Post = ghostBookshelf.Model.extend({
             validOptions = {
                 findOne: ['columns', 'importing', 'withRelated', 'require'],
                 findPage: ['page', 'limit', 'columns', 'filter', 'order', 'status', 'staticPages'],
-                findAll: ['columns', 'filter']
+                findAll: ['columns', 'filter'],
+                destroy: ['destroyAll']
             };
 
         // The post model additionally supports having a formats option
diff --git a/core/server/models/tag.js b/core/server/models/tag.js
index a1b772c072..eefad7a744 100644
--- a/core/server/models/tag.js
+++ b/core/server/models/tag.js
@@ -88,7 +88,8 @@ Tag = ghostBookshelf.Model.extend({
             validOptions = {
                 findPage: ['page', 'limit', 'columns', 'filter', 'order'],
                 findAll: ['columns'],
-                findOne: ['visibility']
+                findOne: ['visibility'],
+                destroy: ['destroyAll']
             };
 
         if (validOptions[methodName]) {
diff --git a/core/server/services/apps/proxy.js b/core/server/services/apps/proxy.js
index 1016874acb..23e7d365e6 100644
--- a/core/server/services/apps/proxy.js
+++ b/core/server/services/apps/proxy.js
@@ -1,12 +1,15 @@
-var _ = require('lodash'),
+const _ = require('lodash'),
     api = require('../../api'),
     helpers = require('../../helpers/register'),
     filters = require('../../filters'),
     common = require('../../lib/common'),
-    router = require('../route').appRouter,
-    generateProxyFunctions;
+    routingService = require('../routing');
+
+let generateProxyFunctions;
 
 generateProxyFunctions = function (name, permissions, isInternal) {
+    const appRouter = routingService.registry.getRouter('appRouter');
+
     var getPermission = function (perm) {
             return permissions[perm];
         },
@@ -77,7 +80,7 @@ generateProxyFunctions = function (name, permissions, isInternal) {
         // Expose the route service...
         routeService: {
             // This allows for mounting an entirely new Router at a path...
-            registerRouter: checkRegisterPermissions('routes', router.mountRouter.bind(router))
+            registerRouter: checkRegisterPermissions('routes', appRouter.mountRouter.bind(appRouter))
         },
         // Mini proxy to the API - needs review
         api: {
diff --git a/core/server/services/channels/Channel.js b/core/server/services/channels/Channel.js
deleted file mode 100644
index 816465807a..0000000000
--- a/core/server/services/channels/Channel.js
+++ /dev/null
@@ -1,62 +0,0 @@
-var _ = require('lodash'),
-    defaultPostOptions = {};
-
-class Channel {
-    constructor(name, options) {
-        // Set the name
-        this.name = name;
-
-        // Store the originally passed in options
-        this._origOptions = _.cloneDeep(options) || {};
-
-        // Setup our route
-        // @TODO should a channel have a route as part of the object? Or should this live elsewhere?
-        this.route = this._origOptions.route ? this.translateRoute(this._origOptions.route) : '/';
-
-        // Define context as name, plus any additional contexts, and don't allow duplicates
-        this.context = _.union([this.name], this._origOptions.context);
-
-        // DATA options
-        // Options for fetching related posts
-        this.postOptions = _.defaults({}, defaultPostOptions, this._origOptions.postOptions);
-
-        // RESOURCE!!!
-        // @TODO figure out a better way to declare relation to resource
-        if (this._origOptions.data) {
-            this.data = this._origOptions.data;
-        }
-
-        // Template options
-        // @TODO fix these HORRIBLE names
-        this.slugTemplate = !!this._origOptions.slugTemplate;
-        if (this._origOptions.frontPageTemplate) {
-            this.frontPageTemplate = this._origOptions.frontPageTemplate;
-        }
-
-        if (this._origOptions.editRedirect) {
-            this.editRedirect = this._origOptions.editRedirect;
-        }
-    }
-
-    get isPaged() {
-        return _.has(this._origOptions, 'paged') ? this._origOptions.paged : true;
-    }
-
-    get hasRSS() {
-        return _.has(this._origOptions, 'rss') ? this._origOptions.rss : true;
-    }
-
-    translateRoute(route) {
-        const routeKeywords = {
-            tag: 'tag',
-            author: 'author'
-        };
-        // @TODO find this a more general / global home, as part of the Router system,
-        // so that ALL routes that get registered WITH Ghost can do this
-        return route.replace(/:t_([a-zA-Z]+)/, function (fullMatch, keyword) {
-            return routeKeywords[keyword];
-        });
-    }
-}
-
-module.exports = Channel;
diff --git a/core/server/services/channels/Channels2.js b/core/server/services/channels/Channels2.js
deleted file mode 100644
index c1105bb946..0000000000
--- a/core/server/services/channels/Channels2.js
+++ /dev/null
@@ -1,165 +0,0 @@
-/* eslint-disable */
-
-const _ = require('lodash');
-const path = require('path');
-const EventEmitter = require('events').EventEmitter;
-const common = require('../../lib/common');
-const settingsCache = require('../settings/cache');
-
-/**
- * @temporary
- *
- * This is not designed yet. This is all temporary.
- */
-class RoutingType extends EventEmitter {
-    constructor(obj) {
-        super();
-
-        this.route = _.defaults(obj.route, {value: null, extensions: {}});
-        this.config = obj.config;
-    }
-
-    getRoute() {
-        return this.route;
-    }
-
-    getPermalinks() {
-        return false;
-    }
-
-    getType() {
-        return this.config.type;
-    }
-
-    getFilter() {
-        return this.config.options && this.config.options.filter;
-    }
-
-    toString() {
-        return `Type: ${this.getType()}, Route: ${this.getRoute().value}`;
-    }
-}
-
-class Collection extends RoutingType {
-    constructor(obj) {
-        super(obj);
-
-        this.permalinks = _.defaults(obj.permalinks, {value: null, extensions: {}});
-
-        this.permalinks.getValue = () => {
-            /**
-             * @deprecated Remove in Ghost 2.0
-             */
-            if (this.permalinks.value.match(/settings\.permalinks/)) {
-                const value = this.permalinks.value.replace(/\/{settings\.permalinks}\//, settingsCache.get('permalinks'));
-                return path.join(this.route.value, value);
-            }
-
-            return path.join(this.route.value, this.permalinks.value);
-        };
-
-        this._listeners();
-        common.events.emit('routingType.created', this);
-    }
-
-    getPermalinks() {
-        return this.permalinks;
-    }
-
-    _listeners() {
-        /**
-         * @deprecated Remove in Ghost 2.0
-         */
-        if (this.getPermalinks() && this.getPermalinks().value.match(/settings\.permalinks/)) {
-            common.events.on('settings.permalinks.edited', () => {
-                this.emit('updated');
-            });
-        }
-    }
-
-    toString() {
-        return `Type: ${this.getType()}, Route: ${this.getRoute().value}, Permalinks: ${this.getPermalinks().value}`;
-    }
-}
-
-class Taxonomy extends RoutingType {
-    constructor(obj) {
-        super(obj);
-
-        this.permalinks = {value: '/:slug/', extensions: {}};
-
-        this.permalinks.getValue = () => {
-            return path.join(this.route.value, this.permalinks.value);
-        };
-
-        common.events.emit('routingType.created', this);
-    }
-
-    getPermalinks() {
-        return this.permalinks;
-    }
-
-    toString() {
-        return `Type: ${this.getType()}, Route: ${this.getRoute().value}, Permalinks: ${this.getPermalinks().value}`;
-    }
-}
-
-class StaticPages extends RoutingType {
-    constructor(obj) {
-        super(obj);
-
-        this.permalinks = {value: '/:slug/', extensions: {}};
-
-        this.permalinks.getValue = () => {
-            return path.join(this.route.value, this.permalinks.value);
-        };
-
-        common.events.emit('routingType.created', this);
-    }
-
-    getPermalinks() {
-        return this.permalinks;
-    }
-}
-
-const collection1 = new Collection({
-    route: {
-        value: '/'
-    },
-    permalinks: {
-        value: '/{settings.permalinks}/'
-    },
-    config: {
-        type: 'posts'
-    }
-});
-
-const taxonomy1 = new Taxonomy({
-    route: {
-        value: '/author/'
-    },
-    config: {
-        type: 'users',
-        options: {}
-    }
-});
-
-const taxonomy2 = new Taxonomy({
-    route: {
-        value: '/tag/'
-    },
-    config: {
-        type: 'tags',
-        options: {}
-    }
-});
-
-const staticPages = new StaticPages({
-    route: {
-        value: '/'
-    },
-    config: {
-        type: 'pages',
-        options: {}
-    }
-});
diff --git a/core/server/services/channels/config.channels.json b/core/server/services/channels/config.channels.json
deleted file mode 100644
index 9319e48902..0000000000
--- a/core/server/services/channels/config.channels.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "index": {
-        "route": "/",
-        "frontPageTemplate": "home"
-    },
-    "tag": {
-        "route": "/:t_tag/:slug/",
-        "postOptions": {
-            "filter": "tags:'%s'+tags.visibility:public"
-        },
-        "data": {
-            "tag": {
-                "type": "read",
-                "resource": "tags",
-                "options": {
-                    "slug": "%s",
-                    "visibility": "public"
-                }
-            }
-        },
-        "slugTemplate": true,
-        "editRedirect": "#/settings/tags/:slug/"
-    },
-    "author": {
-        "route": "/:t_author/:slug/",
-        "postOptions": {
-            "filter": "authors:'%s'"
-        },
-        "data": {
-            "author": {
-                "type": "read",
-                "resource": "users",
-                "options": {
-                    "slug": "%s"
-                }
-            }
-        },
-        "slugTemplate": true,
-        "editRedirect": "#/team/:slug/"
-    }
-}
diff --git a/core/server/services/channels/index.js b/core/server/services/channels/index.js
deleted file mode 100644
index 7e85fecb42..0000000000
--- a/core/server/services/channels/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * # Channel Service
- *
- * The channel service is responsible for:
- * - maintaining the config of available Channels
- * - building out the logic of how an individual Channel works
- * - providing a top level router as an entry point
- *
- * Everything else exposed via the Channel object
- */
-
-// Exports the top-level router
-module.exports = require('./parent-router');
diff --git a/core/server/services/channels/loader.js b/core/server/services/channels/loader.js
deleted file mode 100644
index 407e424389..0000000000
--- a/core/server/services/channels/loader.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var debug = require('ghost-ignition').debug('channels:loader'),
-    _ = require('lodash'),
-    path = require('path'),
-    Channel = require('./Channel'),
-    channels = [];
-
-function loadConfig() {
-    var channelConfig = {};
-
-    // This is a very dirty temporary hack so that we can test out channels with some Beta testers
-    // If you are reading this code, and considering using it, best reach out to us on Slack
-    // Definitely don't be angry at us if the structure of the JSON changes or this goes away.
-    try {
-        channelConfig = require(path.join(process.cwd(), 'config.channels.json'));
-    } catch (err) {
-        channelConfig = require('./config.channels.json');
-    }
-
-    return channelConfig;
-}
-
-module.exports.list = function list() {
-    debug('Load channels start');
-    _.each(loadConfig(), function (channelConfig, channelName) {
-        channels.push(new Channel(channelName, channelConfig));
-    });
-
-    debug('Load channels end');
-    return channels;
-};
diff --git a/core/server/services/channels/parent-router.js b/core/server/services/channels/parent-router.js
deleted file mode 100644
index a6853a8fe9..0000000000
--- a/core/server/services/channels/parent-router.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var ParentRouter = require('../route').ParentRouter,
-    loader = require('./loader'),
-    channelRouter = require('./router');
-
-/**
- * Channels Router
- * Parent channels router will load & mount all routes when
- * .router() is called. This allows for reloading.
- */
-module.exports.router = function channelsRouter() {
-    var channelsRouter = new ParentRouter('channels');
-
-    loader.list().forEach(function (channel) {
-        // Create a new channelRouter, and mount it onto the parent at the correct route
-        channelsRouter.mountRouter(channel.route, channelRouter(channel));
-    });
-
-    return channelsRouter.router();
-};
diff --git a/core/server/services/channels/router.js b/core/server/services/channels/router.js
deleted file mode 100644
index 5522315350..0000000000
--- a/core/server/services/channels/router.js
+++ /dev/null
@@ -1,93 +0,0 @@
-var express = require('express'),
-    _ = require('lodash'),
-    common = require('../../lib/common'),
-    urlService = require('../../services/url'),
-    channelController = require('../../controllers/channel'),
-    rssController = require('../../controllers/rss'),
-    rssRouter,
-    channelRouter;
-
-function handlePageParam(req, res, next, page) {
-    // routeKeywords.page: 'page'
-    var pageRegex = new RegExp('/page/(.*)?/'),
-        rssRegex = new RegExp('/rss/(.*)?/');
-
-    page = parseInt(page, 10);
-
-    if (page === 1) {
-        // Page 1 is an alias, do a permanent 301 redirect
-        if (rssRegex.test(req.url)) {
-            return urlService.utils.redirect301(res, req.originalUrl.replace(rssRegex, '/rss/'));
-        } else {
-            return urlService.utils.redirect301(res, req.originalUrl.replace(pageRegex, '/'));
-        }
-    } else if (page < 1 || isNaN(page)) {
-        // Nothing less than 1 is a valid page number, go straight to a 404
-        return next(new common.errors.NotFoundError({message: common.i18n.t('errors.errors.pageNotFound')}));
-    } else {
-        // Set req.params.page to the already parsed number, and continue
-        req.params.page = page;
-        return next();
-    }
-}
-
-function rssConfigMiddleware(req, res, next) {
-    res.locals.channel.isRSS = true;
-    next();
-}
-
-function channelConfigMiddleware(channel) {
-    return function doChannelConfig(req, res, next) {
-        res.locals.channel = _.cloneDeep(channel);
-        // @TODO refactor into to something explicit
-        res._route = {type: 'channel'};
-        next();
-    };
-}
-
-rssRouter = function rssRouter(channelMiddleware) {
-    // @TODO move this to an RSS module
-    var router = express.Router({mergeParams: true}),
-        baseRoute = '/rss/',
-        pageRoute = urlService.utils.urlJoin(baseRoute, ':page(\\d+)/');
-
-    // @TODO figure out how to collapse this into a single rule
-    router.get(baseRoute, channelMiddleware, rssConfigMiddleware, rssController);
-    router.get(pageRoute, channelMiddleware, rssConfigMiddleware, rssController);
-    // Extra redirect rule
-    router.get('/feed/', function redirectToRSS(req, res) {
-        return urlService.utils.redirect301(res, urlService.utils.urlJoin(urlService.utils.getSubdir(), req.baseUrl, baseRoute));
-    });
-
-    router.param('page', handlePageParam);
-    return router;
-};
-
-channelRouter = function channelRouter(channel) {
-    var channelRouter = express.Router({mergeParams: true}),
-        baseRoute = '/',
-        // routeKeywords.page: 'page'
-        pageRoute = urlService.utils.urlJoin('/page', ':page(\\d+)/'),
-        middleware = [channelConfigMiddleware(channel)];
-
-    channelRouter.get(baseRoute, middleware, channelController);
-
-    if (channel.isPaged) {
-        channelRouter.param('page', handlePageParam);
-        channelRouter.get(pageRoute, middleware, channelController);
-    }
-
-    if (channel.hasRSS) {
-        channelRouter.use(rssRouter(middleware));
-    }
-
-    if (channel.editRedirect) {
-        channelRouter.get('/edit/', function redirect(req, res) {
-            urlService.utils.redirectToAdmin(302, res, channel.editRedirect.replace(':slug', req.params.slug));
-        });
-    }
-
-    return channelRouter;
-};
-
-module.exports = channelRouter;
diff --git a/core/server/services/route/app-router.js b/core/server/services/route/app-router.js
deleted file mode 100644
index 66a63cf3ff..0000000000
--- a/core/server/services/route/app-router.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var ParentRouter = require('./ParentRouter'),
-    appRouter = new ParentRouter('apps');
-
-module.exports = appRouter;
diff --git a/core/server/services/route/index.js b/core/server/services/route/index.js
deleted file mode 100644
index 864d5611f2..0000000000
--- a/core/server/services/route/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * # Route Service
- *
- * Note: routes are patterns, not individual URLs, which have either
- * subrouters, or controllers mounted on them. There are not that many routes.
- *
- * The route service is intended to:
- * - keep track of the registered routes, and what they have mounted on them
- * - provide a way for apps to register routes
- * - expose base classes & registry to the rest of Ghost
- */
-
-// This is the main router, that gets extended & mounted /site
-module.exports.siteRouter = require('./site-router');
-
-// We expose this via the App Proxy, so that Apps can register routes
-module.exports.appRouter = require('./app-router');
-
-// Classes for other parts of Ghost to extend
-module.exports.ParentRouter = require('./ParentRouter');
-
-module.exports.registry = require('./registry');
diff --git a/core/server/services/route/registry.js b/core/server/services/route/registry.js
deleted file mode 100644
index df92c12fd3..0000000000
--- a/core/server/services/route/registry.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var _ = require('lodash'),
-    routes = [];
-
-module.exports = {
-    set(routerName, route) {
-        routes.push({route: route, from: routerName});
-    },
-
-    getAll() {
-        return _.cloneDeep(routes);
-    }
-};
diff --git a/core/server/services/route/site-router.js b/core/server/services/route/site-router.js
deleted file mode 100644
index e4308a53af..0000000000
--- a/core/server/services/route/site-router.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// Site Router is the top level Router for the whole site
-var ParentRouter = require('./ParentRouter'),
-    siteRouter = new ParentRouter('site');
-
-module.exports = siteRouter;
diff --git a/core/server/services/routing/CollectionRouter.js b/core/server/services/routing/CollectionRouter.js
new file mode 100644
index 0000000000..60a1e1e1f7
--- /dev/null
+++ b/core/server/services/routing/CollectionRouter.js
@@ -0,0 +1,157 @@
+const debug = require('ghost-ignition').debug('services:routing:collection-router');
+const common = require('../../lib/common');
+const settingsCache = require('../settings/cache');
+const urlService = require('../url');
+const ParentRouter = require('./ParentRouter');
+
+const controllers = require('./controllers');
+const middlewares = require('./middlewares');
+const RSSRouter = require('./RSSRouter');
+
+class CollectionRouter extends ParentRouter {
+    constructor(indexRoute, object) {
+        super('CollectionRouter');
+
+        // NOTE: index/parent route e.g. /, /podcast/, /magic/ ;)
+        this.route = {
+            value: indexRoute
+        };
+
+        this.permalinks = {
+            originalValue: object.permalink,
+            value: object.permalink
+        };
+
+        this.templates = object.template || [];
+
+        this.filter = object.filter || 'page:false';
+
+        /**
+         * @deprecated Remove in Ghost 2.0
+         */
+        if (this.permalinks.originalValue.match(/globals\.permalinks/)) {
+            this.permalinks.originalValue = this.permalinks.originalValue.replace('{globals.permalinks}', '{settings.permalinks}');
+            this.permalinks.value = this.permalinks.originalValue.replace('{settings.permalinks}', settingsCache.get('permalinks'));
+            this.permalinks.value = urlService.utils.deduplicateDoubleSlashes(this.permalinks.value);
+        }
+
+        this.permalinks.getValue = (options) => {
+            options = options || {};
+
+            // @NOTE: url options are only required when registering urls in express.
+            //        e.g. the UrlService will access the routes and doesn't want to know about possible url options
+            if (options.withUrlOptions) {
+                return urlService.utils.urlJoin(this.permalinks.value, '/:options(edit)?/');
+            }
+
+            return this.permalinks.value;
+        };
+
+        debug(this.route, this.permalinks);
+
+        this._registerRoutes();
+        this._listeners();
+    }
+
+    _registerRoutes() {
+        // REGISTER: context middleware for this collection
+        this.router().use(this._prepareIndexContext.bind(this));
+
+        // REGISTER: collection route e.g. /, /podcast/
+        this.mountRoute(this.route.value, controllers.collection);
+
+        // REGISTER: enable pagination by default
+        this.router().param('page', middlewares.pageParam);
+        this.mountRoute(urlService.utils.urlJoin(this.route.value, 'page', ':page(\\d+)'), controllers.collection);
+
+        this.rssRouter =  new RSSRouter();
+
+        // REGISTER: enable rss by default
+        this.mountRouter(this.route.value, this.rssRouter.router());
+
+        // REGISTER: context middleware for entries
+        this.router().use(this._prepareEntryContext.bind(this));
+
+        // REGISTER: permalinks e.g. /:slug/, /podcast/:slug
+        this.mountRoute(this.permalinks.getValue({withUrlOptions: true}), controllers.entry);
+
+        common.events.emit('router.created', this);
+    }
+
+    /**
+     * We attach context information of the router to the request.
+     * By this we can e.g. access the router options in controllers.
+     *
+     * @TODO: Why do we need two context objects? O_O - refactor this out
+     */
+    _prepareIndexContext(req, res, next) {
+        res.locals.routerOptions = {
+            filter: this.filter,
+            permalinks: this.permalinks.getValue({withUrlOptions: true}),
+            type: this.getType(),
+            context: ['home'],
+            frontPageTemplate: 'home',
+            templates: this.templates.reverse(),
+            identifier: this.identifier
+        };
+
+        res._route = {
+            type: 'collection'
+        };
+
+        next();
+    }
+
+    _prepareEntryContext(req, res, next) {
+        res.locals.routerOptions.context = ['post'];
+        res._route.type = 'entry';
+        next();
+    }
+
+    _listeners() {
+        /**
+         * @deprecated Remove in Ghost 2.0
+         */
+        if (this.getPermalinks() && this.getPermalinks().originalValue.match(/settings\.permalinks/)) {
+            this._onPermalinksEditedListener = this._onPermalinksEdited.bind(this);
+            common.events.on('settings.permalinks.edited', this._onPermalinksEditedListener);
+        }
+    }
+
+    /**
+     * We unmount and mount the permalink url. This enables the ability to change urls on runtime.
+     */
+    _onPermalinksEdited() {
+        this.unmountRoute(this.permalinks.getValue({withUrlOptions: true}));
+
+        this.permalinks.value = this.permalinks.originalValue.replace('{settings.permalinks}', settingsCache.get('permalinks'));
+        this.permalinks.value = urlService.utils.deduplicateDoubleSlashes(this.permalinks.value);
+
+        this.mountRoute(this.permalinks.getValue({withUrlOptions: true}), controllers.entry);
+        this.emit('updated');
+    }
+
+    getType() {
+        return 'posts';
+    }
+
+    getRoute(options) {
+        options = options || {};
+
+        return urlService.utils.createUrl(this.route.value, options.absolute, options.secure);
+    }
+
+    getRssUrl(options) {
+        return urlService.utils.createUrl(urlService.utils.urlJoin(this.route.value, this.rssRouter.route.value), options.absolute, options.secure);
+    }
+
+    reset() {
+        if (!this._onPermalinksEditedListener) {
+            return;
+        }
+
+        common.events.removeListener('settings.permalinks.edited', this._onPermalinksEditedListener);
+    }
+}
+
+module.exports = CollectionRouter;
diff --git a/core/server/services/route/ParentRouter.js b/core/server/services/routing/ParentRouter.js
similarity index 50%
rename from core/server/services/route/ParentRouter.js
rename to core/server/services/routing/ParentRouter.js
index 4c959ab4e3..5960a32f54 100644
--- a/core/server/services/route/ParentRouter.js
+++ b/core/server/services/routing/ParentRouter.js
@@ -6,15 +6,24 @@
  * Only allows for .use and .get at the moment - we don't have clear use-cases for anything else yet.
  */
 
-var debug = require('ghost-ignition').debug('services:routes:ParentRouter'),
+const debug = require('ghost-ignition').debug('services:routing:ParentRouter'),
+    EventEmitter = require('events').EventEmitter,
     express = require('express'),
+    _ = require('lodash'),
+    security = require('../../lib/security'),
+    urlService = require('../url'),
     // This the route registry for the whole site
     registry = require('./registry');
+
 /**
  * We expose a very limited amount of express.Router via specialist methods
  */
-class ParentRouter {
+class ParentRouter extends EventEmitter {
     constructor(name) {
+        super();
+
+        this.identifier = security.identifier.uid(10);
+
         this.name = name;
         this._router = express.Router({mergeParams: true});
     }
@@ -25,7 +34,7 @@ class ParentRouter {
             debug(this.name + ': mountRouter: ' + router.name);
             this._router.use(router);
         } else {
-            registry.set(this.name, path);
+            registry.setRoute(this.name, path);
             debug(this.name + ': mountRouter: ' + router.name + ' at ' + path);
             this._router.use(path, router);
         }
@@ -33,15 +42,49 @@ class ParentRouter {
 
     mountRoute(path, controller) {
         debug(this.name + ': mountRoute for', path, controller.name);
-        registry.set(this.name, path);
+        registry.setRoute(this.name, path);
         this._router.get(path, controller);
     }
 
+    unmountRoute(path) {
+        let indexToRemove = null;
+
+        _.each(this._router.stack, (item, index) => {
+            if (item.path === path) {
+                indexToRemove = index;
+            }
+        });
+
+        if (indexToRemove !== null) {
+            this._router.stack.splice(indexToRemove, 1);
+        }
+    }
+
     router() {
         // @TODO: should this just be the handler that is returned?
         // return this._router.handle.bind(this._router);
         return this._router;
     }
+
+    getPermalinks() {
+        return this.permalinks;
+    }
+
+    getFilter() {
+        return this.filter;
+    }
+
+    /**
+     * Will return the full route including subdirectory.
+     * Do not use this function to mount routes for now, because the subdirectory is already mounted.
+     */
+    getRoute(options) {
+        options = options || {};
+
+        return urlService.utils.createUrl(this.route.value, options.absolute, options.secure);
+    }
+
+    reset() {}
 }
 
 module.exports = ParentRouter;
diff --git a/core/server/services/routing/PreviewRouter.js b/core/server/services/routing/PreviewRouter.js
new file mode 100644
index 0000000000..52bdc29cee
--- /dev/null
+++ b/core/server/services/routing/PreviewRouter.js
@@ -0,0 +1,29 @@
+const ParentRouter = require('./ParentRouter');
+const urlService = require('../url');
+const controllers = require('./controllers');
+
+class PreviewRouter extends ParentRouter {
+    constructor() {
+        super('PreviewRouter');
+
+        this.route = {value: '/p/'};
+
+        this._registerRoutes();
+    }
+
+    _registerRoutes() {
+        this.router().use(this._prepareContext.bind(this));
+
+        this.mountRoute(urlService.utils.urlJoin(this.route.value, ':uuid', ':options?'), controllers.preview);
+    }
+
+    _prepareContext(req, res, next) {
+        res._route = {
+            type: 'entry'
+        };
+
+        next();
+    }
+}
+
+module.exports = PreviewRouter;
diff --git a/core/server/services/routing/RSSRouter.js b/core/server/services/routing/RSSRouter.js
new file mode 100644
index 0000000000..79131cae72
--- /dev/null
+++ b/core/server/services/routing/RSSRouter.js
@@ -0,0 +1,36 @@
+const ParentRouter = require('./ParentRouter');
+const urlService = require('../url');
+
+const controllers = require('./controllers');
+const middlewares = require('./middlewares');
+
+class RSSRouter extends ParentRouter {
+    constructor() {
+        super('RSSRouter');
+
+        this.route = {value: '/rss/'};
+        this._registerRoutes();
+    }
+
+    _registerRoutes() {
+        this.mountRoute(this.route.value, controllers.rss);
+
+        // REGISTER: pagination
+        this.router().param('page', middlewares.pageParam);
+        this.mountRoute(urlService.utils.urlJoin(this.route.value, ':page(\\d+)'), controllers.rss);
+
+        // REGISTER: redirect rule
+        this.mountRoute('/feed/', this._redirectFeedRequest.bind(this));
+    }
+
+    _redirectFeedRequest(req, res) {
+        urlService
+            .utils
+            .redirect301(
+                res,
+                urlService.utils.urlJoin(urlService.utils.getSubdir(), req.baseUrl, this.route.value)
+            );
+    }
+}
+
+module.exports = RSSRouter;
diff --git a/core/server/services/routing/StaticPagesRouter.js b/core/server/services/routing/StaticPagesRouter.js
new file mode 100644
index 0000000000..6e827b5f08
--- /dev/null
+++ b/core/server/services/routing/StaticPagesRouter.js
@@ -0,0 +1,60 @@
+const debug = require('ghost-ignition').debug('services:routing:static-pages-router');
+const ParentRouter = require('./ParentRouter');
+const controllers = require('./controllers');
+const common = require('../../lib/common');
+
+class StaticPagesRouter extends ParentRouter {
+    constructor() {
+        super('StaticPagesRouter');
+
+        this.permalinks = {
+            value: '/:slug/'
+        };
+
+        this.filter = 'page:true';
+
+        this.permalinks.getValue = () => {
+            return this.permalinks.value;
+        };
+
+        debug(this.permalinks);
+
+        this._registerRoutes();
+    }
+
+    _registerRoutes() {
+        this.router().use(this._prepareContext.bind(this));
+
+        // REGISTER: permalink for static pages
+        this.mountRoute(this.permalinks.getValue(), controllers.entry);
+
+        common.events.emit('router.created', this);
+    }
+
+    _prepareContext(req, res, next) {
+        res.locals.routerOptions = {
+            filter: this.filter,
+            permalinks: this.permalinks.getValue(),
+            type: this.getType(),
+            context: ['page']
+        };
+
+        res._route = {
+            type: 'entry'
+        };
+
+        next();
+    }
+
+    getType() {
+        return 'pages';
+    }
+
+    getRoute() {
+        return null;
+    }
+
+    reset() {}
+}
+
+module.exports = StaticPagesRouter;
diff --git a/core/server/services/routing/StaticRoutesRouter.js b/core/server/services/routing/StaticRoutesRouter.js
new file mode 100644
index 0000000000..966d0b0f6a
--- /dev/null
+++ b/core/server/services/routing/StaticRoutesRouter.js
@@ -0,0 +1,46 @@
+const debug = require('ghost-ignition').debug('services:routing:static-pages-router');
+const common = require('../../lib/common');
+const helpers = require('./helpers');
+const ParentRouter = require('./ParentRouter');
+
+class StaticRoutesRouter extends ParentRouter {
+    constructor(key, template) {
+        super('StaticRoutesRouter');
+
+        this.route = {value: key};
+        this.template = template;
+
+        debug(this.route.value, this.template);
+
+        this._registerRoutes();
+    }
+
+    _registerRoutes() {
+        this.router().use(this._prepareContext.bind(this));
+
+        this.mountRoute(this.route.value, this._renderStaticRoute.bind(this));
+
+        common.events.emit('router.created', this);
+    }
+
+    _prepareContext(req, res, next) {
+        res._route = {
+            type: 'custom',
+            templateName: this.template,
+            defaultTemplate: 'index'
+        };
+
+        res.locals.routerOptions = {
+            context: []
+        };
+
+        next();
+    }
+
+    _renderStaticRoute(req, res) {
+        debug('StaticRoutesRouter');
+        helpers.renderer(req, res, {});
+    }
+}
+
+module.exports = StaticRoutesRouter;
diff --git a/core/server/services/routing/TaxonomyRouter.js b/core/server/services/routing/TaxonomyRouter.js
new file mode 100644
index 0000000000..3d7961a43e
--- /dev/null
+++ b/core/server/services/routing/TaxonomyRouter.js
@@ -0,0 +1,108 @@
+const debug = require('ghost-ignition').debug('services:routing:taxonomy-router');
+const common = require('../../lib/common');
+const ParentRouter = require('./ParentRouter');
+const RSSRouter = require('./RSSRouter');
+const urlService = require('../url');
+const controllers = require('./controllers');
+const middlewares = require('./middlewares');
+
+/* eslint-disable */
+const knownTaxonomies = {
+    tag: {
+        filter: "tags:'%s'+tags.visibility:public",
+        data: {
+            type: 'read',
+            resource: 'tags',
+            options: {
+                slug: '%s',
+                visibility: 'public'
+            }
+        },
+        editRedirect: '#/settings/tags/:slug/'
+    },
+    author: {
+        filter: "authors:'%s'",
+        data: {
+            type: 'read',
+            resource: 'users',
+            options: {
+                slug: '%s',
+                visibility: 'public'
+            }
+        },
+        editRedirect: '#/team/:slug/'
+    }
+};
+/* eslint-enable */
+
+class TaxonomyRouter extends ParentRouter {
+    constructor(key, permalinks) {
+        super('Taxonomy');
+
+        this.taxonomyKey = key;
+
+        this.permalinks = {
+            value: permalinks
+        };
+
+        this.permalinks.getValue = () => {
+            return this.permalinks.value;
+        };
+
+        debug(this.permalinks);
+
+        this._registerRoutes();
+    }
+
+    _registerRoutes() {
+        // REGISTER: context middleware
+        this.router().use(this._prepareContext.bind(this));
+
+        // REGISTER: enable rss by default
+        this.mountRouter(this.permalinks.getValue(), new RSSRouter().router());
+
+        // REGISTER: e.g. /tag/:slug/
+        this.mountRoute(this.permalinks.getValue(), controllers.collection);
+
+        // REGISTER: enable pagination for each taxonomy by default
+        this.router().param('page', middlewares.pageParam);
+        this.mountRoute(urlService.utils.urlJoin(this.permalinks.value, 'page', ':page(\\d+)'), controllers.collection);
+
+        this.mountRoute(urlService.utils.urlJoin(this.permalinks.value, 'edit'), this._redirectEditOption.bind(this));
+
+        common.events.emit('router.created', this);
+    }
+
+    _prepareContext(req, res, next) {
+        res.locals.routerOptions = {
+            name: this.taxonomyKey,
+            permalinks: this.permalinks.getValue(),
+            data: {[this.taxonomyKey]: knownTaxonomies[this.taxonomyKey].data},
+            filter: knownTaxonomies[this.taxonomyKey].filter,
+            type: this.getType(),
+            context: [this.taxonomyKey],
+            slugTemplate: true,
+            identifier: this.identifier
+        };
+
+        res._route = {
+            type: 'collection'
+        };
+
+        next();
+    }
+
+    _redirectEditOption(req, res) {
+        urlService.utils.redirectToAdmin(302, res, knownTaxonomies[this.taxonomyKey].editRedirect.replace(':slug', req.params.slug));
+    }
+
+    getType() {
+        return knownTaxonomies[this.taxonomyKey].data.resource;
+    }
+
+    getRoute() {
+        return null;
+    }
+}
+
+module.exports = TaxonomyRouter;
diff --git a/core/server/services/routing/bootstrap.js b/core/server/services/routing/bootstrap.js
new file mode 100644
index 0000000000..217a48f2e1
--- /dev/null
+++ b/core/server/services/routing/bootstrap.js
@@ -0,0 +1,68 @@
+const debug = require('ghost-ignition').debug('services:routing:bootstrap');
+const _ = require('lodash');
+const settingsService = require('../settings');
+const StaticRoutesRouter = require('./StaticRoutesRouter');
+const StaticPagesRouter = require('./StaticPagesRouter');
+const CollectionRouter = require('./CollectionRouter');
+const TaxonomyRouter = require('./TaxonomyRouter');
+const PreviewRouter = require('./PreviewRouter');
+const ParentRouter = require('./ParentRouter');
+
+const registry = require('./registry');
+
+/**
+ * Create a set of default and dynamic routers defined in the routing yaml.
+ *
+ * @TODO:
+ *   - is the PreviewRouter an app?
+ */
+module.exports = function bootstrap() {
+    debug('bootstrap');
+
+    registry.resetAllRouters();
+    registry.resetAllRoutes();
+
+    const siteRouter = new ParentRouter('site');
+    const previewRouter = new PreviewRouter();
+
+    siteRouter.mountRouter(previewRouter.router());
+
+    registry.setRouter('siteRouter', siteRouter);
+    registry.setRouter('previewRouter', previewRouter);
+
+    const dynamicRoutes = settingsService.get('routes');
+
+    _.each(dynamicRoutes.taxonomies, (value, key) => {
+        const taxonomyRouter = new TaxonomyRouter(key, value);
+        siteRouter.mountRouter(taxonomyRouter.router());
+
+        registry.setRouter(taxonomyRouter.identifier, taxonomyRouter);
+    });
+
+    _.each(dynamicRoutes.routes, (value, key) => {
+        const staticRoutesRouter = new StaticRoutesRouter(key, value);
+        siteRouter.mountRouter(staticRoutesRouter.router());
+
+        registry.setRouter(staticRoutesRouter.identifier, staticRoutesRouter);
+    });
+
+    _.each(dynamicRoutes.collections, (value, key) => {
+        const collectionRouter = new CollectionRouter(key, value);
+        siteRouter.mountRouter(collectionRouter.router());
+
+        registry.setRouter(collectionRouter.identifier, collectionRouter);
+    });
+
+    const staticPagesRouter = new StaticPagesRouter();
+    siteRouter.mountRouter(staticPagesRouter.router());
+
+    registry.setRouter('staticPagesRouter', staticPagesRouter);
+
+    const appRouter = new ParentRouter('apps');
+    siteRouter.mountRouter(appRouter.router());
+
+    registry.setRouter('appRouter', appRouter);
+
+    debug('Routes:', registry.getAllRoutes());
+    return siteRouter.router();
+};
diff --git a/core/server/services/routing/controllers/collection.js b/core/server/services/routing/controllers/collection.js
new file mode 100644
index 0000000000..48f5ebd49c
--- /dev/null
+++ b/core/server/services/routing/controllers/collection.js
@@ -0,0 +1,54 @@
+const _ = require('lodash'),
+    debug = require('ghost-ignition').debug('services:routing:controllers:collection'),
+    common = require('../../../lib/common'),
+    security = require('../../../lib/security'),
+    themes = require('../../themes'),
+    filters = require('../../../filters'),
+    helpers = require('../helpers');
+
+module.exports = function collectionController(req, res, next) {
+    debug('collectionController', req.params, res.locals.routerOptions);
+
+    const pathOptions = {
+        page: req.params.page !== undefined ? req.params.page : 1,
+        slug: req.params.slug ? security.string.safe(req.params.slug) : undefined
+    };
+
+    if (pathOptions.page) {
+        const postsPerPage = parseInt(themes.getActive().config('posts_per_page'));
+
+        // CASE: no negative posts per page
+        if (!isNaN(postsPerPage) && postsPerPage > 0) {
+            pathOptions.limit = postsPerPage;
+        }
+    }
+
+    return helpers.fetchData(pathOptions, res.locals.routerOptions)
+        .then(function handleResult(result) {
+            // CASE: requested page is greater than number of pages we have
+            if (pathOptions.page > result.meta.pagination.pages) {
+                return next(new common.errors.NotFoundError({
+                    message: common.i18n.t('errors.errors.pageNotFound')
+                }));
+            }
+
+            // Format data 1
+            // @TODO: figure out if this can be removed, it's supposed to ensure that absolutely URLs get generated
+            // correctly for the various objects, but I believe it doesn't work and a different approach is needed.
+            helpers.secure(req, result.posts);
+
+            // @TODO: get rid of this O_O
+            _.each(result.data, function (data) {
+                helpers.secure(req, data);
+            });
+
+            // @TODO: properly design these filters
+            filters.doFilter('prePostsRender', result.posts, res.locals)
+                .then(function (posts) {
+                    result.posts = posts;
+                    return result;
+                })
+                .then(helpers.renderCollection(req, res));
+        })
+        .catch(helpers.handleError(next));
+};
diff --git a/core/server/services/routing/controllers/entry.js b/core/server/services/routing/controllers/entry.js
new file mode 100644
index 0000000000..7fcd416d4f
--- /dev/null
+++ b/core/server/services/routing/controllers/entry.js
@@ -0,0 +1,78 @@
+const debug = require('ghost-ignition').debug('services:routing:controllers:entry'),
+    urlService = require('../../url'),
+    filters = require('../../../filters'),
+    helpers = require('../helpers');
+
+/**
+ * @TODO:
+ *   - use `filter` for `findOne`?
+ *   - always execute `next` until no router want's to serve and 404's
+ */
+module.exports = function entryController(req, res, next) {
+    debug('entryController', res.locals.routerOptions);
+
+    return helpers.postLookup(req.path, res.locals.routerOptions)
+        .then(function then(lookup) {
+            // Format data 1
+            const post = lookup ? lookup.post : false;
+
+            if (!post) {
+                debug('no post');
+                return next();
+            }
+
+            // CASE: postlookup can detect options for example /edit, unknown options get ignored and end in 404
+            if (lookup.isUnknownOption) {
+                debug('isUnknownOption');
+                return next();
+            }
+
+            // CASE: last param is of url is /edit, redirect to admin
+            if (lookup.isEditURL) {
+                debug('redirect. is edit url');
+                return urlService.utils.redirectToAdmin(302, res, '/editor/' + post.id);
+            }
+
+            /**
+             * CASE: check if type of router owns this resource
+             *
+             * Static pages have a hardcoded permalink, which is `/:slug/`.
+             * Imagine you define a collection under `/` with the permalink `/:slug/`.
+             *
+             * The router hierarchy is:
+             *
+             * 1. collections
+             * 2. static pages
+             *
+             * Both permalinks are registered in express. If you serve a static page, the
+             * collection router will try to serve this as a post resource.
+             *
+             * That's why we have to check against the router type.
+             */
+            if (urlService.getResource(post.url).config.type !== res.locals.routerOptions.type) {
+                debug('not my resource type');
+                return next();
+            }
+
+            /**
+             * CASE: Permalink is not valid anymore, we redirect him permanently to the correct one
+             *       This should only happen if you have date permalinks enabled and you change
+             *       your publish date.
+             *
+             * @NOTE
+             *
+             * The resource url always contains the subdirectory. This was different before dynamic routing.
+             * That's why we have to use the original url, which contains the sub-directory.
+             */
+            if (post.url !== req.originalUrl) {
+                debug('redirect');
+                return urlService.utils.redirect301(res, post.url);
+            }
+
+            helpers.secure(req, post);
+
+            filters.doFilter('prePostsRender', post, res.locals)
+                .then(helpers.renderEntry(req, res));
+        })
+        .catch(helpers.handleError(next));
+};
diff --git a/core/server/services/routing/controllers/index.js b/core/server/services/routing/controllers/index.js
new file mode 100644
index 0000000000..852140aaef
--- /dev/null
+++ b/core/server/services/routing/controllers/index.js
@@ -0,0 +1,17 @@
+module.exports = {
+    get entry() {
+        return require('./entry');
+    },
+
+    get collection() {
+        return require('./collection');
+    },
+
+    get rss() {
+        return require('./rss');
+    },
+
+    get preview() {
+        return require('./preview');
+    }
+};
diff --git a/core/server/services/routing/controllers/preview.js b/core/server/services/routing/controllers/preview.js
new file mode 100644
index 0000000000..2adb779d6c
--- /dev/null
+++ b/core/server/services/routing/controllers/preview.js
@@ -0,0 +1,42 @@
+const debug = require('ghost-ignition').debug('services:routing:controllers:preview'),
+    api = require('../../../api'),
+    urlService = require('../../url'),
+    filters = require('../../../filters'),
+    helpers = require('../helpers');
+
+module.exports = function previewController(req, res, next) {
+    debug('previewController');
+
+    const params = {
+        uuid: req.params.uuid,
+        status: 'all',
+        include: 'author,authors,tags'
+    };
+
+    api.posts.read(params)
+        .then(function then(result) {
+            const post = result.posts[0];
+
+            if (!post) {
+                return next();
+            }
+
+            if (req.params.options && req.params.options.toLowerCase() === 'edit') {
+                // CASE: last param of the url is /edit, redirect to admin
+                return urlService.utils.redirectToAdmin(302, res, '/editor/' + post.id);
+            } else if (req.params.options) {
+                // CASE: unknown options param detected, ignore
+                return next();
+            }
+
+            if (post.status === 'published') {
+                return urlService.utils.redirect301(res, urlService.getUrlByResourceId(post.id));
+            }
+
+            helpers.secure(req, post);
+
+            filters.doFilter('prePostsRender', post, res.locals)
+                .then(helpers.renderEntry(req, res));
+        })
+        .catch(helpers.handleError(next));
+};
diff --git a/core/server/services/routing/controllers/rss.js b/core/server/services/routing/controllers/rss.js
new file mode 100644
index 0000000000..0ea01cb2e4
--- /dev/null
+++ b/core/server/services/routing/controllers/rss.js
@@ -0,0 +1,57 @@
+const _ = require('lodash'),
+    debug = require('ghost-ignition').debug('services:routing:controllers:rss'),
+    url = require('url'),
+    common = require('../../../lib/common'),
+    security = require('../../../lib/security'),
+    settingsCache = require('../../settings/cache'),
+    rssService = require('../../rss'),
+    helpers = require('../helpers');
+
+// @TODO: is this the right logic? move to UrlService utils
+function getBaseUrlForRSSReq(originalUrl, pageParam) {
+    return url.parse(originalUrl).pathname.replace(new RegExp('/' + pageParam + '/$'), '/');
+}
+
+// @TODO: is this really correct? Should we be using meta data title?
+function getTitle(relatedData) {
+    relatedData = relatedData || {};
+    var titleStart = _.get(relatedData, 'author[0].name') || _.get(relatedData, 'tag[0].name') || '';
+
+    titleStart += titleStart ? ' - ' : '';
+    return titleStart + settingsCache.get('title');
+}
+
+// @TODO: the collection controller does almost the same
+module.exports = function rssController(req, res, next) {
+    debug('rssController');
+
+    const pathOptions = {
+        page: req.params.page !== undefined ? req.params.page : 1,
+        slug: req.params.slug ? security.string.safe(req.params.slug) : undefined
+    };
+
+    // CASE: we are using an rss cache - url must be normalised (without pagination)
+    // @TODO: this belongs to the rss service
+    const baseUrl = getBaseUrlForRSSReq(req.originalUrl, pathOptions.page);
+
+    helpers.fetchData(pathOptions, res.locals.routerOptions)
+        .then(function formatResult(result) {
+            const response = _.pick(result, ['posts', 'meta']);
+
+            response.title = getTitle(result.data);
+            response.description = settingsCache.get('description');
+
+            return response;
+        })
+        .then(function (data) {
+            // CASE: if requested page is greater than number of pages we have
+            if (pathOptions.page > data.meta.pagination.pages) {
+                return next(new common.errors.NotFoundError({
+                    message: common.i18n.t('errors.errors.pageNotFound')
+                }));
+            }
+
+            return rssService.render(res, baseUrl, data);
+        })
+        .catch(helpers.handleError(next));
+};
diff --git a/core/server/controllers/frontend/context.js b/core/server/services/routing/helpers/context.js
similarity index 93%
rename from core/server/controllers/frontend/context.js
rename to core/server/services/routing/helpers/context.js
index f5c13cf1c5..888254c91c 100644
--- a/core/server/controllers/frontend/context.js
+++ b/core/server/services/routing/helpers/context.js
@@ -10,10 +10,8 @@
  * 2. req.params.page - always has the page parameter, regardless of if the URL contains a keyword (RSS pages don't)
  * 3. data - used for telling the difference between posts and pages
  */
-
-var labs = require('../../services/labs'),
-
-    // Context patterns, should eventually come from Channel configuration
+const labs = require('../../labs'),
+    // @TODO: fix this, this is app specific and should be dynamic
     // routeKeywords.private: 'private'
     privatePattern = new RegExp('^\\/private\\/'),
     // routeKeywords.subscribe: 'subscribe'
@@ -49,8 +47,8 @@ function setResponseContext(req, res, data) {
     }
 
     // Each page can only have at most one of these
-    if (res.locals.channel) {
-        res.locals.context = res.locals.context.concat(res.locals.channel.context);
+    if (res.locals.routerOptions) {
+        res.locals.context = res.locals.context.concat(res.locals.routerOptions.context);
     } else if (privatePattern.test(res.locals.relativeUrl)) {
         res.locals.context.push('private');
     } else if (subscribePattern.test(res.locals.relativeUrl) && labs.isSet('subscribers') === true) {
diff --git a/core/server/controllers/frontend/error.js b/core/server/services/routing/helpers/error.js
similarity index 100%
rename from core/server/controllers/frontend/error.js
rename to core/server/services/routing/helpers/error.js
diff --git a/core/server/services/routing/helpers/fetch-data.js b/core/server/services/routing/helpers/fetch-data.js
new file mode 100644
index 0000000000..9c15e8caee
--- /dev/null
+++ b/core/server/services/routing/helpers/fetch-data.js
@@ -0,0 +1,120 @@
+/**
+ * # Fetch Data
+ * Dynamically build and execute queries on the API
+ */
+const _ = require('lodash'),
+    Promise = require('bluebird'),
+    urlService = require('../../url'),
+    api = require('../../../api'),
+    defaultPostQuery = {};
+
+// The default settings for a default post query
+const queryDefaults = {
+    type: 'browse',
+    resource: 'posts',
+    options: {}
+};
+
+/**
+ * Default post query needs to always include author, authors & tags
+ *
+ * @deprecated: `author`, will be removed in Ghost 2.0
+ */
+_.extend(defaultPostQuery, queryDefaults, {
+    options: {
+        include: 'author,authors,tags'
+    }
+});
+
+/**
+ * ## Process Query
+ * Takes a 'query' object, ensures that type, resource and options are set
+ * Replaces occurrences of `%s` in options with slugParam
+ * Converts the query config to a promise for the result
+ *
+ * @param {{type: String, resource: String, options: Object}} query
+ * @param {String} slugParam
+ * @returns {Promise} promise for an API call
+ */
+function processQuery(query, slugParam) {
+    query = _.cloneDeep(query);
+
+    // Ensure that all the properties are filled out
+    _.defaultsDeep(query, queryDefaults);
+
+    // Replace any slugs, see TaxonomyRouter. We replace any '%s' by the slug
+    _.each(query.options, function (option, name) {
+        query.options[name] = _.isString(option) ? option.replace(/%s/g, slugParam) : option;
+    });
+
+    // Return a promise for the api query
+    return api[query.resource][query.type](query.options);
+}
+
+/**
+ * ## Fetch Data
+ * Calls out to get posts per page, builds the final posts query & builds any additional queries
+ * Wraps the queries using Promise.props to ensure it gets named responses
+ * Does a first round of formatting on the response, and returns
+ */
+function fetchData(pathOptions, routerOptions) {
+    pathOptions = pathOptions || {};
+    routerOptions = routerOptions || {};
+
+    let postQuery = _.cloneDeep(defaultPostQuery),
+        props = {};
+
+    if (routerOptions.filter) {
+        postQuery.options.filter = routerOptions.filter;
+    }
+
+    if (pathOptions.hasOwnProperty('page')) {
+        postQuery.options.page = pathOptions.page;
+    }
+
+    if (pathOptions.hasOwnProperty('limit')) {
+        postQuery.options.limit = pathOptions.limit;
+    }
+
+    // CASE: always fetch post collection
+    // The filter can in theory contain a "%s" e.g. filter="primary_tag:%s"
+    props.posts = processQuery(postQuery, pathOptions.slug);
+
+    // CASE: fetch more data defined by the router e.g. tags, authors - see TaxonomyRouter
+    _.each(routerOptions.data, function (query, name) {
+        props[name] = processQuery(query, pathOptions.slug);
+    });
+
+    return Promise.props(props)
+        .then(function formatResponse(results) {
+            const response = _.cloneDeep(results.posts);
+            delete results.posts;
+
+            // CASE: does this post belong to this collection?
+            // EXCEPTION: Taxonomies always list the posts which belong to a tag/author.
+            if (!routerOptions.data && routerOptions.identifier) {
+                response.posts = _.filter(response.posts, (post) => {
+                    if (urlService.owns(routerOptions.identifier, post.url)) {
+                        return post;
+                    }
+                });
+            }
+
+            // process any remaining data
+            if (!_.isEmpty(results)) {
+                response.data = {};
+
+                _.each(results, function (result, name) {
+                    if (routerOptions.data[name].type === 'browse') {
+                        response.data[name] = result;
+                    } else {
+                        response.data[name] = result[routerOptions.data[name].resource];
+                    }
+                });
+            }
+
+            return response;
+        });
+}
+
+module.exports = fetchData;
diff --git a/core/server/controllers/frontend/format-response.js b/core/server/services/routing/helpers/format-response.js
similarity index 93%
rename from core/server/controllers/frontend/format-response.js
rename to core/server/services/routing/helpers/format-response.js
index a4bfd14e92..bf4499c6d6 100644
--- a/core/server/controllers/frontend/format-response.js
+++ b/core/server/services/routing/helpers/format-response.js
@@ -1,4 +1,4 @@
-var _   = require('lodash');
+const _ = require('lodash');
 
 /**
  * formats variables for handlebars in multi-post contexts.
@@ -37,6 +37,6 @@ function formatResponse(post) {
 }
 
 module.exports = {
-    channel: formatPageResponse,
+    collection: formatPageResponse,
     entry: formatResponse
 };
diff --git a/core/server/services/routing/helpers/index.js b/core/server/services/routing/helpers/index.js
new file mode 100644
index 0000000000..3c18da4295
--- /dev/null
+++ b/core/server/services/routing/helpers/index.js
@@ -0,0 +1,41 @@
+module.exports = {
+    get postLookup() {
+        return require('./post-lookup');
+    },
+
+    get fetchData() {
+        return require('./fetch-data');
+    },
+
+    get renderCollection() {
+        return require('./render-collection');
+    },
+
+    get formatResponse() {
+        return require('./format-response');
+    },
+
+    get renderEntry() {
+        return require('./render-entry');
+    },
+
+    get renderer() {
+        return require('./renderer');
+    },
+
+    get templates() {
+        return require('./templates');
+    },
+
+    get secure() {
+        return require('./secure');
+    },
+
+    get handleError() {
+        return require('./error');
+    },
+
+    get context() {
+        return require('./context');
+    }
+};
diff --git a/core/server/services/routing/helpers/post-lookup.js b/core/server/services/routing/helpers/post-lookup.js
new file mode 100644
index 0000000000..2439db3389
--- /dev/null
+++ b/core/server/services/routing/helpers/post-lookup.js
@@ -0,0 +1,54 @@
+const _ = require('lodash'),
+    Promise = require('bluebird'),
+    url = require('url'),
+    debug = require('ghost-ignition').debug('services:routing:helpers:post-lookup'),
+    routeMatch = require('path-match')(),
+    api = require('../../../api');
+
+function postLookup(postUrl, routerOptions) {
+    debug(postUrl);
+
+    const targetPath = url.parse(postUrl).path,
+        permalinks = routerOptions.permalinks;
+
+    let isEditURL = false;
+
+    // CASE: e.g. /:slug/ -> { slug: 'value' }
+    const matchFunc = routeMatch(permalinks);
+    const params = matchFunc(targetPath);
+
+    debug(params);
+
+    // CASE 1: no matches, resolve
+    // CASE 2: params can be empty e.g. permalink is /featured/:options(edit)?/ and path is /featured/
+    if (params === false || !Object.keys(params).length) {
+        return Promise.resolve();
+    }
+
+    // CASE: redirect if url contains `/edit/` at the end
+    if (params.options && params.options.toLowerCase() === 'edit') {
+        isEditURL = true;
+    }
+
+    /**
+     * Query database to find post.
+     *
+     * @deprecated: `author`, will be removed in Ghost 2.0
+     */
+    return api.posts.read(_.extend(_.pick(params, 'slug', 'id'), {include: 'author,authors,tags'}))
+        .then(function then(result) {
+            const post = result.posts[0];
+
+            if (!post) {
+                return Promise.resolve();
+            }
+
+            return {
+                post: post,
+                isEditURL: isEditURL,
+                isUnknownOption: isEditURL ? false : !!params.options
+            };
+        });
+}
+
+module.exports = postLookup;
diff --git a/core/server/services/routing/helpers/render-collection.js b/core/server/services/routing/helpers/render-collection.js
new file mode 100644
index 0000000000..145be42105
--- /dev/null
+++ b/core/server/services/routing/helpers/render-collection.js
@@ -0,0 +1,12 @@
+const debug = require('ghost-ignition').debug('services:routing:helpers:render-collection'),
+    formatResponse = require('./format-response'),
+    renderer = require('./renderer');
+
+module.exports = function renderCollection(req, res) {
+    debug('renderCollection called');
+    return function renderCollection(result) {
+        // Format data 2
+        // Render
+        return renderer(req, res, formatResponse.collection(result));
+    };
+};
diff --git a/core/server/controllers/frontend/render-entry.js b/core/server/services/routing/helpers/render-entry.js
similarity index 70%
rename from core/server/controllers/frontend/render-entry.js
rename to core/server/services/routing/helpers/render-entry.js
index d25041afaa..8b1f4b22d5 100644
--- a/core/server/controllers/frontend/render-entry.js
+++ b/core/server/services/routing/helpers/render-entry.js
@@ -1,4 +1,4 @@
-var debug = require('ghost-ignition').debug('channels:render-post'),
+const debug = require('ghost-ignition').debug('services:routing:helpers:render-post'),
     formatResponse = require('./format-response'),
     renderer = require('./renderer');
 /*
@@ -10,11 +10,8 @@ var debug = require('ghost-ignition').debug('channels:render-post'),
 module.exports = function renderEntry(req, res) {
     debug('renderEntry called');
     return function renderEntry(entry) {
-        // Renderer begin
         // Format data 2 - 1 is in preview/entry
-        var data = formatResponse.entry(entry);
-
-        // Render Call
-        return renderer(req, res, data);
+        // Render
+        return renderer(req, res, formatResponse.entry(entry));
     };
 };
diff --git a/core/server/controllers/frontend/renderer.js b/core/server/services/routing/helpers/renderer.js
similarity index 83%
rename from core/server/controllers/frontend/renderer.js
rename to core/server/services/routing/helpers/renderer.js
index 4204f9be0d..18f4f23ec5 100644
--- a/core/server/controllers/frontend/renderer.js
+++ b/core/server/services/routing/helpers/renderer.js
@@ -1,4 +1,4 @@
-var debug = require('ghost-ignition').debug('renderer'),
+const debug = require('ghost-ignition').debug('services:routing:helpers:renderer'),
     setContext = require('./context'),
     templates = require('./templates');
 
@@ -12,5 +12,6 @@ module.exports = function renderer(req, res, data) {
     // Render Call
     debug('Rendering template: ' + res._template + ' for: ' + req.originalUrl);
     debug('res.locals', res.locals);
+
     res.render(res._template, data);
 };
diff --git a/core/server/controllers/frontend/secure.js b/core/server/services/routing/helpers/secure.js
similarity index 100%
rename from core/server/controllers/frontend/secure.js
rename to core/server/services/routing/helpers/secure.js
diff --git a/core/server/controllers/frontend/templates.js b/core/server/services/routing/helpers/templates.js
similarity index 59%
rename from core/server/controllers/frontend/templates.js
rename to core/server/services/routing/helpers/templates.js
index 981572341d..387e5d08a4 100644
--- a/core/server/controllers/frontend/templates.js
+++ b/core/server/services/routing/helpers/templates.js
@@ -2,11 +2,12 @@
 //
 // Figure out which template should be used to render a request
 // based on the templates which are allowed, and what is available in the theme
-// TODO: consider where this should live as it deals with channels, singles, and errors
-var _ = require('lodash'),
+// TODO: consider where this should live as it deals with collections, entries, and errors
+const _ = require('lodash'),
     path = require('path'),
-    config = require('../../config'),
-    themes = require('../../services/themes'),
+    url = require('url'),
+    config = require('../../../config'),
+    themes = require('../../themes'),
     _private = {};
 
 /**
@@ -20,7 +21,7 @@ var _ = require('lodash'),
  * @returns {String[]}
  */
 _private.getErrorTemplateHierarchy = function getErrorTemplateHierarchy(statusCode) {
-    var errorCode = _.toString(statusCode),
+    const errorCode = _.toString(statusCode),
         templateList = ['error'];
 
     // Add error class template: E.g. error-4xx.hbs or error-5xx.hbs
@@ -33,30 +34,38 @@ _private.getErrorTemplateHierarchy = function getErrorTemplateHierarchy(statusCo
 };
 
 /**
- * ## Get Channel Template Hierarchy
+ * ## Get Collection Template Hierarchy
  *
  * Fetch the ordered list of templates that can be used to render this request.
  * 'index' is the default / fallback
- * For channels with slugs: [:channelName-:slug, :channelName, index]
- * For channels without slugs: [:channelName, index]
- * Channels can also have a front page template which is used if this is the first page of the channel, e.g. 'home.hbs'
+ * For collections with slugs: [:collectionName-:slug, :collectionName, index]
+ * For collections without slugs: [:collectionName, index]
+ * Collections can also have a front page template which is used if this is the first page of the collections, e.g. 'home.hbs'
  *
- * @param {Object} channelOpts
+ * @param {Object} routerOptions
  * @returns {String[]}
  */
-_private.getChannelTemplateHierarchy = function getChannelTemplateHierarchy(channelOpts) {
-    var templateList = ['index'];
+_private.getCollectionTemplateHierarchy = function getCollectionTemplateHierarchy(routerOptions, requestOptions) {
+    const templateList = ['index'];
 
-    if (channelOpts.name && channelOpts.name !== 'index') {
-        templateList.unshift(channelOpts.name);
+    // CASE: author, tag
+    if (routerOptions.name && routerOptions.name !== 'index') {
+        templateList.unshift(routerOptions.name);
 
-        if (channelOpts.slugTemplate && channelOpts.slugParam) {
-            templateList.unshift(channelOpts.name + '-' + channelOpts.slugParam);
+        if (routerOptions.slugTemplate && routerOptions.slugParam) {
+            templateList.unshift(routerOptions.name + '-' + routerOptions.slugParam);
         }
     }
 
-    if (channelOpts.frontPageTemplate && channelOpts.postOptions.page === 1) {
-        templateList.unshift(channelOpts.frontPageTemplate);
+    // CASE: collections can define a template list
+    if (routerOptions.templates && routerOptions.templates.length) {
+        routerOptions.templates.forEach((template) => {
+            templateList.unshift(template);
+        });
+    }
+
+    if (routerOptions.frontPageTemplate && (requestOptions.path === '/' || requestOptions.path === '/' && requestOptions.page === 1)) {
+        templateList.unshift(routerOptions.frontPageTemplate);
     }
 
     return templateList;
@@ -74,8 +83,8 @@ _private.getChannelTemplateHierarchy = function getChannelTemplateHierarchy(chan
  * @returns {String[]}
  */
 _private.getEntryTemplateHierarchy = function getEntryTemplateHierarchy(postObject) {
-    var templateList = ['post'],
-        slugTemplate = 'post-' + postObject.slug;
+    const templateList = ['post'];
+    let slugTemplate = 'post-' + postObject.slug;
 
     if (postObject.page) {
         templateList.unshift('page');
@@ -101,7 +110,7 @@ _private.getEntryTemplateHierarchy = function getEntryTemplateHierarchy(postObje
  * @param {String} fallback - a fallback template
  */
 _private.pickTemplate = function pickTemplate(templateList, fallback) {
-    var template;
+    let template;
 
     if (!_.isArray(templateList)) {
         templateList = [templateList];
@@ -111,37 +120,45 @@ _private.pickTemplate = function pickTemplate(templateList, fallback) {
         template = fallback;
     } else {
         template = _.find(templateList, function (template) {
+            if (!template) {
+                return;
+            }
+
             return themes.getActive().hasTemplate(template);
         });
     }
 
     if (!template) {
-        template = fallback;
+        if (!fallback) {
+            template = 'index';
+        } else {
+            template = fallback;
+        }
     }
 
     return template;
 };
 
 _private.getTemplateForEntry = function getTemplateForEntry(postObject) {
-    var templateList = _private.getEntryTemplateHierarchy(postObject),
+    const templateList = _private.getEntryTemplateHierarchy(postObject),
         fallback = templateList[templateList.length - 1];
     return _private.pickTemplate(templateList, fallback);
 };
 
-_private.getTemplateForChannel = function getTemplateForChannel(channelOpts) {
-    var templateList = _private.getChannelTemplateHierarchy(channelOpts),
+_private.getTemplateForCollection = function getTemplateForCollection(routerOptions, requestOptions) {
+    const templateList = _private.getCollectionTemplateHierarchy(routerOptions, requestOptions),
         fallback = templateList[templateList.length - 1];
     return _private.pickTemplate(templateList, fallback);
 };
 
 _private.getTemplateForError = function getTemplateForError(statusCode) {
-    var templateList = _private.getErrorTemplateHierarchy(statusCode),
+    const templateList = _private.getErrorTemplateHierarchy(statusCode),
         fallback = path.resolve(config.get('paths').defaultViews, 'error.hbs');
     return _private.pickTemplate(templateList, fallback);
 };
 
 module.exports.setTemplate = function setTemplate(req, res, data) {
-    var routeConfig = res._route || {};
+    const routeConfig = res._route || {};
 
     if (res._template && !req.err) {
         return;
@@ -156,8 +173,11 @@ module.exports.setTemplate = function setTemplate(req, res, data) {
         case 'custom':
             res._template = _private.pickTemplate(routeConfig.templateName, routeConfig.defaultTemplate);
             break;
-        case 'channel':
-            res._template = _private.getTemplateForChannel(res.locals.channel);
+        case 'collection':
+            res._template = _private.getTemplateForCollection(res.locals.routerOptions, {
+                path: url.parse(req.url).pathname,
+                page: req.params.page
+            });
             break;
         case 'entry':
             res._template = _private.getTemplateForEntry(data.post);
diff --git a/core/server/services/routing/index.js b/core/server/services/routing/index.js
new file mode 100644
index 0000000000..2a480bc74a
--- /dev/null
+++ b/core/server/services/routing/index.js
@@ -0,0 +1,21 @@
+module.exports = {
+    get bootstrap() {
+        return require('./bootstrap');
+    },
+
+    get registry() {
+        return require('./registry');
+    },
+
+    get helpers() {
+        return require('./helpers');
+    },
+
+    get CollectionRouter() {
+        return require('./CollectionRouter');
+    },
+
+    get TaxonomyRouter() {
+        return require('./TaxonomyRouter');
+    }
+};
diff --git a/core/server/services/routing/middlewares/index.js b/core/server/services/routing/middlewares/index.js
new file mode 100644
index 0000000000..5736fe1ab7
--- /dev/null
+++ b/core/server/services/routing/middlewares/index.js
@@ -0,0 +1,5 @@
+module.exports = {
+    get pageParam() {
+        return require('./page-param');
+    }
+};
diff --git a/core/server/services/routing/middlewares/page-param.js b/core/server/services/routing/middlewares/page-param.js
new file mode 100644
index 0000000000..74db248661
--- /dev/null
+++ b/core/server/services/routing/middlewares/page-param.js
@@ -0,0 +1,27 @@
+const common = require('../../../lib/common/index'),
+    urlService = require('../../url/index');
+
+module.exports = function handlePageParam(req, res, next, page) {
+    // routeKeywords.page: 'page'
+    const pageRegex = new RegExp('/page/(.*)?/'),
+        rssRegex = new RegExp('/rss/(.*)?/');
+
+    page = parseInt(page, 10);
+
+    if (page === 1) {
+        // CASE: page 1 is an alias for the collection index, do a permanent 301 redirect
+        // @TODO: this belongs into the rss router!
+        if (rssRegex.test(req.url)) {
+            return urlService.utils.redirect301(res, req.originalUrl.replace(rssRegex, '/rss/'));
+        } else {
+            return urlService.utils.redirect301(res, req.originalUrl.replace(pageRegex, '/'));
+        }
+    } else if (page < 1 || isNaN(page)) {
+        return next(new common.errors.NotFoundError({
+            message: common.i18n.t('errors.errors.pageNotFound')
+        }));
+    } else {
+        req.params.page = page;
+        return next();
+    }
+};
diff --git a/core/server/services/routing/registry.js b/core/server/services/routing/registry.js
new file mode 100644
index 0000000000..495e608723
--- /dev/null
+++ b/core/server/services/routing/registry.js
@@ -0,0 +1,43 @@
+const _ = require('lodash');
+let routes = [];
+let routers = {};
+
+module.exports = {
+    setRoute(routerName, route) {
+        routes.push({route: route, from: routerName});
+    },
+
+    setRouter(name, router) {
+        routers[name] = router;
+    },
+
+    getAllRoutes() {
+        return _.cloneDeep(routes);
+    },
+
+    getRouter(name) {
+        return routers[name];
+    },
+
+    getFirstCollectionRouter() {
+        return _.find(routers, (router) => {
+            if (router.name === 'CollectionRouter') {
+                return router;
+            }
+
+            return false;
+        });
+    },
+
+    resetAllRoutes() {
+        routes = [];
+    },
+
+    resetAllRouters() {
+        _.each(routers, (value) => {
+            value.reset();
+        });
+
+        routers = {};
+    }
+};
diff --git a/core/server/services/rss/generate-feed.js b/core/server/services/rss/generate-feed.js
index 63779b5591..06896c8aae 100644
--- a/core/server/services/rss/generate-feed.js
+++ b/core/server/services/rss/generate-feed.js
@@ -20,7 +20,7 @@ generateTags = function generateTags(data) {
 };
 
 generateItem = function generateItem(post, siteUrl, secure) {
-    var itemUrl = urlService.utils.urlFor('post', {post: post, secure: secure}, true),
+    var itemUrl = urlService.getUrlByResourceId(post.id, {secure: secure, absolute: true}),
         htmlContent = urlService.utils.makeAbsoluteUrls(post.html, siteUrl, itemUrl),
         item = {
             title: post.title,
@@ -65,7 +65,7 @@ generateItem = function generateItem(post, siteUrl, secure) {
 /**
  * Generate Feed
  *
- * Data is an object which contains the res.locals + results from fetching a channel, but without related data.
+ * Data is an object which contains the res.locals + results from fetching a collection, but without related data.
  *
  * @param {string} baseUrl
  * @param {{title, description, safeVersion, secure, posts}} data
diff --git a/core/server/services/settings/default-routes.yaml b/core/server/services/settings/default-routes.yaml
index 7979e89ba0..7b53c6542f 100644
--- a/core/server/services/settings/default-routes.yaml
+++ b/core/server/services/settings/default-routes.yaml
@@ -2,7 +2,7 @@ routes:
 
 collections:
   /:
-    route: '{globals.permalinks}'
+    permalink: '{globals.permalinks}' # special 1.0 compatibility setting. See the docs for details.
     template:
       - home
       - index
diff --git a/core/server/services/settings/index.js b/core/server/services/settings/index.js
index 49241f2c0e..8f5429af6b 100644
--- a/core/server/services/settings/index.js
+++ b/core/server/services/settings/index.js
@@ -6,7 +6,7 @@ const _ = require('lodash'),
     SettingsModel = require('../../models/settings').Settings,
     SettingsCache = require('./cache'),
     SettingsLoader = require('./loader'),
-    // EnsureSettingsFiles = require('./ensure-settings'),
+    ensureSettingsFiles = require('./ensure-settings'),
     common = require('../../lib/common'),
     debug = require('ghost-ignition').debug('services:settings:index');
 
@@ -16,23 +16,18 @@ module.exports = {
 
         debug('init settings service for:', knownSettings);
 
-        // TODO: uncomment this section, once we want to
-        // copy the default routes.yaml file into the /content/settings
-        // folder
-
         // Make sure that supported settings files are available
         // inside of the `content/setting` directory
-        // return EnsureSettingsFiles(knownSettings)
-        //     .then(() => {
-
-        // Update the defaults
-        return SettingsModel.populateDefaults()
-            .then(function (settingsCollection) {
+        return ensureSettingsFiles(knownSettings)
+            .then(() => {
+                // Update the defaults
+                return SettingsModel.populateDefaults();
+            })
+            .then((settingsCollection) => {
                 // Initialise the cache with the result
                 // This will bind to events for further updates
                 SettingsCache.init(settingsCollection);
             });
-        // });
     },
 
     /**
diff --git a/core/server/services/settings/loader.js b/core/server/services/settings/loader.js
index db16703481..40c64f6925 100644
--- a/core/server/services/settings/loader.js
+++ b/core/server/services/settings/loader.js
@@ -3,7 +3,8 @@ const fs = require('fs-extra'),
     debug = require('ghost-ignition').debug('services:settings:settings-loader'),
     common = require('../../lib/common'),
     config = require('../../config'),
-    yamlParser = require('./yaml-parser');
+    yamlParser = require('./yaml-parser'),
+    validate = require('./validate');
 
 /**
  * Reads the desired settings YAML file and passes the
@@ -21,8 +22,8 @@ module.exports = function loadSettings(setting) {
         const file = fs.readFileSync(filePath, 'utf8');
         debug('settings file found for', setting);
 
-        // yamlParser returns a JSON object
-        return yamlParser(file, fileName);
+        const object = yamlParser(file, fileName);
+        return validate(object);
     } catch (err) {
         if (common.errors.utils.isIgnitionError(err)) {
             throw err;
diff --git a/core/server/services/settings/validate.js b/core/server/services/settings/validate.js
new file mode 100644
index 0000000000..26d04ea249
--- /dev/null
+++ b/core/server/services/settings/validate.js
@@ -0,0 +1,205 @@
+const _ = require('lodash');
+const common = require('../../lib/common');
+const _private = {};
+
+_private.validateRoutes = function validateRoutes(routes) {
+    _.each(routes, (routingTypeObject, routingTypeObjectKey) => {
+        // CASE: we hard-require trailing slashes for the index route
+        if (!routingTypeObjectKey.match(/\/$/)) {
+            throw new common.errors.ValidationError({
+                message: common.i18n.t('errors.services.settings.yaml.validate', {
+                    at: routingTypeObjectKey,
+                    reason: 'A trailing slash is required.'
+                })
+            });
+        }
+
+        // CASE: we hard-require leading slashes for the index route
+        if (!routingTypeObjectKey.match(/^\//)) {
+            throw new common.errors.ValidationError({
+                message: common.i18n.t('errors.services.settings.yaml.validate', {
+                    at: routingTypeObjectKey,
+                    reason: 'A leading slash is required.'
+                })
+            });
+        }
+
+        // CASE: you define /about/:
+        if (!routingTypeObject) {
+            throw new common.errors.ValidationError({
+                message: common.i18n.t('errors.services.settings.yaml.validate', {
+                    at: routingTypeObjectKey,
+                    reason: 'Please define a permalink route.'
+                }),
+                help: 'e.g. permalink: /{slug}/'
+            });
+        }
+    });
+
+    return routes;
+};
+
+_private.validateCollections = function validateCollections(collections) {
+    _.each(collections, (routingTypeObject, routingTypeObjectKey) => {
+        // CASE: we hard-require trailing slashes for the collection index route
+        if (!routingTypeObjectKey.match(/\/$/)) {
+            throw new common.errors.ValidationError({
+                message: common.i18n.t('errors.services.settings.yaml.validate', {
+                    at: routingTypeObjectKey,
+                    reason: 'A trailing slash is required.'
+                })
+            });
+        }
+
+        // CASE: we hard-require leading slashes for the collection index route
+        if (!routingTypeObjectKey.match(/^\//)) {
+            throw new common.errors.ValidationError({
+                message: common.i18n.t('errors.services.settings.yaml.validate', {
+                    at: routingTypeObjectKey,
+                    reason: 'A leading slash is required.'
+                })
+            });
+        }
+
+        if (!routingTypeObject.hasOwnProperty('permalink')) {
+            throw new common.errors.ValidationError({
+                message: common.i18n.t('errors.services.settings.yaml.validate', {
+                    at: routingTypeObjectKey,
+                    reason: 'Please define a permalink route.'
+                }),
+                help: 'e.g. permalink: /{slug}/'
+            });
+        }
+
+        // CASE: validate permalink key
+        if (routingTypeObject.hasOwnProperty('permalink')) {
+            if (!routingTypeObject.permalink) {
+                throw new common.errors.ValidationError({
+                    message: common.i18n.t('errors.services.settings.yaml.validate', {
+                        at: routingTypeObjectKey,
+                        reason: 'Please define a permalink route.'
+                    }),
+                    help: 'e.g. permalink: /{slug}/'
+                });
+            }
+
+            // CASE: we hard-require trailing slashes for the value/permalink route
+            if (!routingTypeObject.permalink.match(/\/$/) && !routingTypeObject.permalink.match(/globals\.permalinks/)) {
+                throw new common.errors.ValidationError({
+                    message: common.i18n.t('errors.services.settings.yaml.validate', {
+                        at: routingTypeObject.permalink,
+                        reason: 'A trailing slash is required.'
+                    })
+                });
+            }
+
+            // CASE: we hard-require leading slashes for the value/permalink route
+            if (!routingTypeObject.permalink.match(/^\//) && !routingTypeObject.permalink.match(/globals\.permalinks/)) {
+                throw new common.errors.ValidationError({
+                    message: common.i18n.t('errors.services.settings.yaml.validate', {
+                        at: routingTypeObject.permalink,
+                        reason: 'A leading slash is required.'
+                    })
+                });
+            }
+
+            // CASE: notation /:slug/ or /:primary_author/ is not allowed. We only accept /{{...}}/.
+            if (routingTypeObject.permalink && routingTypeObject.permalink.match(/\/\:\w+/)) {
+                throw new common.errors.ValidationError({
+                    message: common.i18n.t('errors.services.settings.yaml.validate', {
+                        at: routingTypeObject.permalink,
+                        reason: 'Please use the following notation e.g. /{slug}/.'
+                    })
+                });
+            }
+
+            // CASE: transform {.*} into :\w+ notation. This notation is our internal notation e.g. see permalink
+            //       replacement in our UrlService utility.
+            if (routingTypeObject.permalink.match(/{.*}/)) {
+                routingTypeObject.permalink = routingTypeObject.permalink.replace(/{(\w+)}/g, ':$1');
+            }
+        }
+    });
+
+    return collections;
+};
+
+_private.validateTaxonomies = function validateTaxonomies(taxonomies) {
+    _.each(taxonomies, (routingTypeObject, routingTypeObjectKey) => {
+        if (!routingTypeObject) {
+            throw new common.errors.ValidationError({
+                message: common.i18n.t('errors.services.settings.yaml.validate', {
+                    at: routingTypeObjectKey,
+                    reason: 'Please define a taxonomy permalink route.'
+                }),
+                help: 'e.g. tag: /tag/{slug}/'
+            });
+        }
+
+        // CASE: we hard-require trailing slashes for the taxonomie permalink route
+        if (!routingTypeObject.match(/\/$/)) {
+            throw new common.errors.ValidationError({
+                message: common.i18n.t('errors.services.settings.yaml.validate', {
+                    at: routingTypeObject,
+                    reason: 'A trailing slash is required.'
+                })
+            });
+        }
+
+        // CASE: we hard-require leading slashes for the value/permalink route
+        if (!routingTypeObject.match(/^\//)) {
+            throw new common.errors.ValidationError({
+                message: common.i18n.t('errors.services.settings.yaml.validate', {
+                    at: routingTypeObject,
+                    reason: 'A leading slash is required.'
+                })
+            });
+        }
+
+        // CASE: notation /:slug/ or /:primary_author/ is not allowed. We only accept /{{...}}/.
+        if (routingTypeObject && routingTypeObject.match(/\/\:\w+/)) {
+            throw new common.errors.ValidationError({
+                message: common.i18n.t('errors.services.settings.yaml.validate', {
+                    at: routingTypeObject,
+                    reason: 'Please use the following notation e.g. /{slug}/.'
+                })
+            });
+        }
+
+        // CASE: transform {.*} into :\w+ notation. This notation is our internal notation e.g. see permalink
+        //       replacement in our UrlService utility.
+        if (routingTypeObject && routingTypeObject.match(/{.*}/)) {
+            routingTypeObject = routingTypeObject.replace(/{(\w+)}/g, ':$1');
+            taxonomies[routingTypeObjectKey] = routingTypeObject;
+        }
+    });
+
+    return taxonomies;
+};
+
+/**
+ * Validate and sanitize the routing object.
+ */
+module.exports = function validate(object) {
+    if (!object) {
+        object = {};
+    }
+
+    if (!object.routes) {
+        object.routes = {};
+    }
+
+    if (!object.collections) {
+        object.collections = {};
+    }
+
+    if (!object.taxonomies) {
+        object.taxonomies = {};
+    }
+
+    object.routes = _private.validateRoutes(object.routes);
+    object.collections = _private.validateCollections(object.collections);
+    object.taxonomies = _private.validateTaxonomies(object.taxonomies);
+
+    return object;
+};
diff --git a/core/server/services/slack.js b/core/server/services/slack.js
index d669694ee4..e91b47b43d 100644
--- a/core/server/services/slack.js
+++ b/core/server/services/slack.js
@@ -28,7 +28,7 @@ function ping(post) {
 
     // If this is a post, we want to send the link of the post
     if (schema.isPost(post)) {
-        message = urlService.utils.urlFor('post', {post: post}, true);
+        message = urlService.getUrlByResourceId(post.id, {absolute: true});
     } else {
         message = post.message;
     }
diff --git a/core/server/services/url/Queue.js b/core/server/services/url/Queue.js
index a17b33008c..c8bb70407f 100644
--- a/core/server/services/url/Queue.js
+++ b/core/server/services/url/Queue.js
@@ -9,7 +9,7 @@ const debug = require('ghost-ignition').debug('services:url:queue'),
  * Ghost fetches as earliest as possible the resources from the database. The reason is simply: we
  * want to know all urls as soon as possible.
  *
- * Parallel to this, the routes/channels are read/prepared and registered in express.
+ * Parallel to this, the routes are read/prepared and registered in express.
  * So the challenge is to handle both resource availability and route registration.
  * If you start an event, all subscribers of it are executed in a sequence. The queue will wait
  * till the current subscriber has finished it's work.
@@ -21,9 +21,9 @@ const debug = require('ghost-ignition').debug('services:url:queue'),
  *
  * - you can re-run an event
  * - you can add more subscribers to an existing queue
- * - you can order subscribers (helpful if you want to order routes/channels)
+ * - you can order subscribers (helpful if you want to order routers)
  *
- * Each subscriber represents one instance of the url generator. One url generator represents one channel/route.
+ * Each subscriber represents one instance of the url generator. One url generator represents one router.
  *
  * ### Tolerance option
  *
@@ -201,6 +201,14 @@ class Queue extends EventEmitter {
 
         this.toNotify = {};
     }
+
+    softReset() {
+        _.each(this.toNotify, (obj) => {
+            clearTimeout(obj.timeout);
+        });
+
+        this.toNotify = {};
+    }
 }
 
 module.exports = Queue;
diff --git a/core/server/services/url/Resources.js b/core/server/services/url/Resources.js
index ff4aeba73c..7ce88c746b 100644
--- a/core/server/services/url/Resources.js
+++ b/core/server/services/url/Resources.js
@@ -246,6 +246,14 @@ class Resources {
         this.listeners = [];
         this.data = {};
     }
+
+    softReset() {
+        this.data = {};
+
+        _.each(resourcesConfig, (resourceConfig) => {
+            this.data[resourceConfig.type] = [];
+        });
+    }
 }
 
 module.exports = Resources;
diff --git a/core/server/services/url/UrlGenerator.js b/core/server/services/url/UrlGenerator.js
index 19c3724da3..bfdcac5083 100644
--- a/core/server/services/url/UrlGenerator.js
+++ b/core/server/services/url/UrlGenerator.js
@@ -1,9 +1,7 @@
 const _ = require('lodash'),
-    moment = require('moment-timezone'),
     jsonpath = require('jsonpath'),
     debug = require('ghost-ignition').debug('services:url:generator'),
     localUtils = require('./utils'),
-    settingsCache = require('../settings/cache'),
     /**
      * @TODO: This is a fake version of the upcoming GQL tool.
      * GQL will offer a tool to match a JSON against a filter.
@@ -20,8 +18,8 @@ const _ = require('lodash'),
     };
 
 class UrlGenerator {
-    constructor(routingType, queue, resources, urls, position) {
-        this.routingType = routingType;
+    constructor(router, queue, resources, urls, position) {
+        this.router = router;
         this.queue = queue;
         this.urls = urls;
         this.resources = resources;
@@ -29,9 +27,9 @@ class UrlGenerator {
 
         debug('constructor', this.toString());
 
-        // CASE: channels can define custom filters, but not required.
-        if (this.routingType.getFilter()) {
-            this.filter = transformFilter(this.routingType.getFilter());
+        // CASE: routers can define custom filters, but not required.
+        if (this.router.getFilter()) {
+            this.filter = transformFilter(this.router.getFilter());
             debug('filter', this.filter);
         }
 
@@ -43,7 +41,7 @@ class UrlGenerator {
          * @NOTE: currently only used if the permalink setting changes and it's used for this url generator.
          * @TODO: remove in Ghost 2.0
          */
-        this.routingType.addListener('updated', () => {
+        this.router.addListener('updated', () => {
             const myResources = this.urls.getByGeneratorId(this.uid);
 
             myResources.forEach((object) => {
@@ -74,7 +72,7 @@ class UrlGenerator {
         debug('_onInit', this.toString());
 
         // @NOTE: get the resources of my type e.g. posts.
-        const resources = this.resources.getAllByType(this.routingType.getType());
+        const resources = this.resources.getAllByType(this.router.getType());
 
         _.each(resources, (resource) => {
             this._try(resource);
@@ -85,7 +83,7 @@ class UrlGenerator {
         debug('onAdded', this.toString());
 
         // CASE: you are type "pages", but the incoming type is "users"
-        if (event.type !== this.routingType.getType()) {
+        if (event.type !== this.router.getType()) {
             return;
         }
 
@@ -138,57 +136,10 @@ class UrlGenerator {
      * We currently generate relative urls.
      */
     _generateUrl(resource) {
-        let url = this.routingType.getPermalinks().getValue();
-        url = this._replacePermalink(url, resource);
+        const permalink = this.router.getPermalinks().getValue();
+        const url = localUtils.replacePermalink(permalink, resource.data);
 
-        return localUtils.createUrl(url, false, false);
-    }
-
-    /**
-     * @TODO:
-     * This is a copy of `replacePermalink` of our url utility, see ./utils.
-     * But it has modifications, because the whole url utility doesn't work anymore.
-     * We will rewrite some of the functions in the utility.
-     */
-    _replacePermalink(url, resource) {
-        var output = url,
-            primaryTagFallback = 'all',
-            publishedAtMoment = moment.tz(resource.data.published_at || Date.now(), settingsCache.get('active_timezone')),
-            permalink = {
-                year: function () {
-                    return publishedAtMoment.format('YYYY');
-                },
-                month: function () {
-                    return publishedAtMoment.format('MM');
-                },
-                day: function () {
-                    return publishedAtMoment.format('DD');
-                },
-                author: function () {
-                    return resource.data.primary_author.slug;
-                },
-                primary_author: function () {
-                    return resource.data.primary_author ? resource.data.primary_author.slug : primaryTagFallback;
-                },
-                primary_tag: function () {
-                    return resource.data.primary_tag ? resource.data.primary_tag.slug : primaryTagFallback;
-                },
-                slug: function () {
-                    return resource.data.slug;
-                },
-                id: function () {
-                    return resource.data.id;
-                }
-            };
-
-        // replace tags like :slug or :year with actual values
-        output = output.replace(/(:[a-z_]+)/g, function (match) {
-            if (_.has(permalink, match.substr(1))) {
-                return permalink[match.substr(1)]();
-            }
-        });
-
-        return output;
+        return localUtils.createUrl(url, false, false, true);
     }
 
     /**
@@ -218,7 +169,7 @@ class UrlGenerator {
                     action: 'added:' + resource.data.id,
                     eventData: {
                         id: resource.data.id,
-                        type: this.routingType.getType()
+                        type: this.router.getType()
                     }
                 });
             }
@@ -234,12 +185,22 @@ class UrlGenerator {
         resource.addListener('removed', onRemoved.bind(this));
     }
 
+    hasUrl(url) {
+        const existingUrl = this.urls.getByUrl(url);
+
+        if (existingUrl.length && existingUrl[0].generatorId === this.uid) {
+            return true;
+        }
+
+        return false;
+    }
+
     getUrls() {
         return this.urls.getByGeneratorId(this.uid);
     }
 
     toString() {
-        return this.routingType.toString();
+        return this.router.toString();
     }
 }
 
diff --git a/core/server/services/url/UrlService.js b/core/server/services/url/UrlService.js
index 76d1d24f7e..b8d18f470b 100644
--- a/core/server/services/url/UrlService.js
+++ b/core/server/services/url/UrlService.js
@@ -9,16 +9,9 @@ const _debug = require('ghost-ignition').debug._base,
     localUtils = require('./utils');
 
 class UrlService {
-    constructor(options) {
-        options = options || {};
-
+    constructor() {
         this.utils = localUtils;
 
-        // You can disable the url preload, in case we encounter a problem with the new url service.
-        if (options.disableUrlPreload) {
-            return;
-        }
-
         this.finished = false;
         this.urlGenerators = [];
 
@@ -31,10 +24,10 @@ class UrlService {
 
     _listeners() {
         /**
-         * The purpose of this event is to notify the url service as soon as a channel get's created.
+         * The purpose of this event is to notify the url service as soon as a router get's created.
          */
-        this._onRoutingTypeListener = this._onRoutingType.bind(this);
-        common.events.on('routingType.created', this._onRoutingTypeListener);
+        this._onRouterAddedListener = this._onRouterAddedType.bind(this);
+        common.events.on('router.created', this._onRouterAddedListener);
 
         /**
          * The queue will notify us if url generation has started/finished.
@@ -44,9 +37,6 @@ class UrlService {
 
         this._onQueueEndedListener = this._onQueueEnded.bind(this);
         this.queue.addListener('ended', this._onQueueEnded.bind(this));
-
-        this._resetListener = this.reset.bind(this);
-        common.events.on('server.stop', this._resetListener);
     }
 
     _onQueueStarted(event) {
@@ -61,21 +51,42 @@ class UrlService {
         }
     }
 
-    _onRoutingType(routingType) {
-        debug('routingType.created');
+    _onRouterAddedType(router) {
+        // CASE: there are router types which do not generate resource urls
+        //       e.g. static route router
+        //       we are listening on the general `router.created` event - every router throws this event
+        if (!router || !router.getPermalinks()) {
+            return;
+        }
 
-        let urlGenerator = new UrlGenerator(routingType, this.queue, this.resources, this.urls, this.urlGenerators.length);
+        debug('router.created');
+
+        let urlGenerator = new UrlGenerator(router, this.queue, this.resources, this.urls, this.urlGenerators.length);
         this.urlGenerators.push(urlGenerator);
     }
 
     /**
      * You have a url and want to know which the url belongs to.
+     *
      * It's in theory possible that multiple resources generate the same url,
-     * but they both would serve different content e.g. static pages and collections.
+     * but they both would serve different content.
+     *
+     * e.g. if we remove the slug uniqueness and you create a static
+     * page and a post with the same slug. And both are served under `/` with the permalink `/:slug/`.
+     *
+     *
+     * Each url is unique and it depends on the hierarchy of router registration is configured.
+     * There is no url collision, everything depends on registration order.
+     *
+     * e.g. posts which live in a collection are stronger than a static page.
      *
      * We only return the resource, which would be served.
+     *
+     * @NOTE: only accepts relative urls at the moment.
      */
-    getResource(url) {
+    getResource(url, options) {
+        options = options || {};
+
         let objects = this.urls.getByUrl(url);
 
         if (!objects.length) {
@@ -102,9 +113,15 @@ class UrlService {
                         toReturn.push(object);
                     }
                 }
+
+                return toReturn;
             }, []);
         }
 
+        if (options.returnEverything) {
+            return objects[0];
+        }
+
         return objects[0].resource;
     }
 
@@ -114,18 +131,71 @@ class UrlService {
 
     /**
      * Get url by resource id.
+     * e.g. tags, authors, posts, pages
+     *
+     * If we can't find a url for an id, we have to return a url.
+     * There are many components in Ghost which call `getUrlByResourceId` and
+     * based on the return value, they set the resource url somewhere e.g. meta data.
+     * Or if you define no collections in your yaml file and serve a page.
+     * You will see a suggestion of posts, but they all don't belong to a collection.
+     * They would show localhost:2368/null/.
      */
-    getUrlByResourceId(id) {
+    getUrlByResourceId(id, options) {
+        options = options || {};
+
         const obj = this.urls.getByResourceId(id);
 
         if (obj) {
+            if (options.absolute) {
+                return this.utils.createUrl(obj.url, options.absolute, options.secure);
+            }
+
             return obj.url;
         }
 
-        return null;
+        if (options.absolute) {
+            return this.utils.createUrl('/404/', options.absolute, options.secure);
+        }
+
+        return '/404/';
+    }
+
+    owns(routerId, url) {
+        debug('owns', routerId, url);
+
+        let urlGenerator;
+
+        this.urlGenerators.every((_urlGenerator) => {
+            if (_urlGenerator.router.identifier === routerId) {
+                urlGenerator = _urlGenerator;
+                return false;
+            }
+
+            return true;
+        });
+
+        if (!urlGenerator) {
+            return false;
+        }
+
+        return urlGenerator.hasUrl(url);
+    }
+
+    getPermalinkByUrl(url, options) {
+        options = options || {};
+
+        const object = this.getResource(url, {returnEverything: true});
+
+        if (!object) {
+            return null;
+        }
+
+        return _.find(this.urlGenerators, {uid: object.generatorId}).router.getPermalinks()
+            .getValue(options);
     }
 
     reset() {
+        debug('reset');
         this.urlGenerators = [];
 
         this.urls.reset();
@@ -134,8 +204,24 @@ class UrlService {
 
         this._onQueueStartedListener && this.queue.removeListener('started', this._onQueueStartedListener);
         this._onQueueEndedListener && this.queue.removeListener('ended', this._onQueueEndedListener);
-        this._onRoutingTypeListener && common.events.removeListener('routingType.created', this._onRoutingTypeListener);
-        this._resetListener && common.events.removeListener('server.stop', this._resetListener);
+        this._onRouterAddedListener && common.events.removeListener('router.created', this._onRouterAddedListener);
+    }
+
+    resetGenerators() {
+        debug('resetGenerators');
+        this.finished = false;
+        this.urlGenerators = [];
+        this.urls.reset();
+        this.queue.reset();
+        this.resources.softReset();
+    }
+
+    softReset() {
+        debug('softReset');
+        this.finished = false;
+        this.urls.softReset();
+        this.queue.softReset();
+        this.resources.softReset();
     }
 }
 
diff --git a/core/server/services/url/Urls.js b/core/server/services/url/Urls.js
index 6fa1a2a805..e57682cd74 100644
--- a/core/server/services/url/Urls.js
+++ b/core/server/services/url/Urls.js
@@ -72,7 +72,8 @@ class Urls {
      *  - resource1 -> /welcome/
      *  - resource2 -> /welcome/
      *
-     *  But depending on the routing registration, you will always serve e.g. resource1.
+     *  But depending on the routing registration, you will always serve e.g. resource1,
+     *  because the router it belongs to was registered first.
      */
     getByUrl(url) {
         return _.reduce(Object.keys(this.urls), (toReturn, resourceId) => {
@@ -102,6 +103,10 @@ class Urls {
     reset() {
         this.urls = {};
     }
+
+    softReset() {
+        this.urls = {};
+    }
 }
 
 module.exports = Urls;
diff --git a/core/server/services/url/index.js b/core/server/services/url/index.js
index 6111f37d5e..cd4b29fe23 100644
--- a/core/server/services/url/index.js
+++ b/core/server/services/url/index.js
@@ -1,8 +1,5 @@
-const config = require('../../config'),
-    UrlService = require('./UrlService'),
-    urlService = new UrlService({
-        disableUrlPreload: config.get('disableUrlPreload')
-    });
+const UrlService = require('./UrlService'),
+    urlService = new UrlService();
 
 // Singleton
 module.exports = urlService;
diff --git a/core/server/services/url/utils.js b/core/server/services/url/utils.js
index 88a9322976..fe1d05b043 100644
--- a/core/server/services/url/utils.js
+++ b/core/server/services/url/utils.js
@@ -149,7 +149,7 @@ function getAdminUrl() {
 // - secure (optional, default:false) - boolean whether or not to force SSL
 // Returns:
 //  - a URL which always ends with a slash
-function createUrl(urlPath, absolute, secure) {
+function createUrl(urlPath, absolute, secure, trailingSlash) {
     urlPath = urlPath || '/';
     absolute = absolute || false;
     var base;
@@ -161,24 +161,23 @@ function createUrl(urlPath, absolute, secure) {
         base = getSubdir();
     }
 
+    if (trailingSlash) {
+        if (!urlPath.match(/\/$/)) {
+            urlPath += '/';
+        }
+    }
+
     return urlJoin(base, urlPath);
 }
 
 /**
  * creates the url path for a post based on blog timezone and permalink pattern
- *
- * @param {JSON} post
- * @returns {string}
  */
-function urlPathForPost(post) {
-    var output = '',
-        permalinks = settingsCache.get('permalinks'),
-        // routeKeywords.primaryTagFallback: 'all'
+function replacePermalink(permalink, resource) {
+    let output = permalink,
         primaryTagFallback = 'all',
-        // routeKeywords.primaryAuthorFallback: 'all'
-        primaryAuthorFallback = 'all',
-        publishedAtMoment = moment.tz(post.published_at || Date.now(), settingsCache.get('active_timezone')),
-        tags = {
+        publishedAtMoment = moment.tz(resource.published_at || Date.now(), settingsCache.get('active_timezone')),
+        permalinkLookUp = {
             year: function () {
                 return publishedAtMoment.format('YYYY');
             },
@@ -188,36 +187,27 @@ function urlPathForPost(post) {
             day: function () {
                 return publishedAtMoment.format('DD');
             },
-            /**
-             * @deprecated: `author`, will be removed in Ghost 2.0
-             */
             author: function () {
-                return post.author.slug;
-            },
-            primary_tag: function () {
-                return post.primary_tag ? post.primary_tag.slug : primaryTagFallback;
+                return resource.primary_author.slug;
             },
             primary_author: function () {
-                return post.primary_author ? post.primary_author.slug : primaryAuthorFallback;
+                return resource.primary_author ? resource.primary_author.slug : primaryTagFallback;
+            },
+            primary_tag: function () {
+                return resource.primary_tag ? resource.primary_tag.slug : primaryTagFallback;
             },
             slug: function () {
-                return post.slug;
+                return resource.slug;
             },
             id: function () {
-                return post.id;
+                return resource.id;
             }
         };
 
-    if (post.page) {
-        output += '/:slug/';
-    } else {
-        output += permalinks;
-    }
-
     // replace tags like :slug or :year with actual values
     output = output.replace(/(:[a-z_]+)/g, function (match) {
-        if (_.has(tags, match.substr(1))) {
-            return tags[match.substr(1)]();
+        if (_.has(permalinkLookUp, match.substr(1))) {
+            return permalinkLookUp[match.substr(1)]();
         }
     });
 
@@ -226,17 +216,13 @@ function urlPathForPost(post) {
 
 // ## urlFor
 // Synchronous url creation for a given context
-// Can generate a url for a named path, given path, or known object (post)
+// Can generate a url for a named path and given path.
 // Determines what sort of context it has been given, and delegates to the correct generation method,
 // Finally passing to createUrl, to ensure any subdirectory is honoured, and the url is absolute if needed
 // Usage:
 // urlFor('home', true) -> http://my-ghost-blog.com/
 // E.g. /blog/ subdir
 // urlFor({relativeUrl: '/my-static-page/'}) -> /blog/my-static-page/
-// E.g. if post object represents welcome post, and slugs are set to standard
-// urlFor('post', {...}) -> /welcome-to-ghost/
-// E.g. if post object represents welcome post, and slugs are set to date
-// urlFor('post', {...}) -> /2014/01/01/welcome-to-ghost/
 // Parameters:
 // - context - a string, or json object describing the context for which you need a url
 // - data (optional) - a json object containing data needed to generate a url
@@ -246,13 +232,12 @@ function urlPathForPost(post) {
 function urlFor(context, data, absolute) {
     var urlPath = '/',
         secure, imagePathRe,
-        knownObjects = ['post', 'tag', 'author', 'image', 'nav'], baseUrl,
+        knownObjects = ['image', 'nav'], baseUrl,
         hostname,
 
         // this will become really big
         knownPaths = {
             home: '/',
-            rss: '/rss/',
             api: API_PATH,
             sitemap_xsl: '/sitemap.xsl'
         };
@@ -269,19 +254,7 @@ function urlFor(context, data, absolute) {
     if (_.isObject(context) && context.relativeUrl) {
         urlPath = context.relativeUrl;
     } else if (_.isString(context) && _.indexOf(knownObjects, context) !== -1) {
-        // trying to create a url for an object
-        if (context === 'post' && data.post) {
-            urlPath = data.post.url;
-            secure = data.secure;
-        } else if (context === 'tag' && data.tag) {
-            // routeKeywords.tag: 'tag'
-            urlPath = urlJoin('/tag', data.tag.slug, '/');
-            secure = data.tag.secure;
-        } else if (context === 'author' && data.author) {
-            // routeKeywords.author: 'author'
-            urlPath = urlJoin('/author', data.author.slug, '/');
-            secure = data.author.secure;
-        } else if (context === 'image' && data.image) {
+        if (context === 'image' && data.image) {
             urlPath = data.image;
             imagePathRe = new RegExp('^' + getSubdir() + '/' + STATIC_IMAGE_URL_PREFIX);
             absolute = imagePathRe.test(data.image) ? absolute : false;
@@ -435,16 +408,27 @@ function makeAbsoluteUrls(html, siteUrl, itemUrl) {
     return htmlContent;
 }
 
+function absoluteToRelative(urlToModify) {
+    const urlObj = url.parse(urlToModify);
+    return urlObj.pathname;
+}
+
+function deduplicateDoubleSlashes(url) {
+    return url.replace(/\/\//g, '/');
+}
+
+module.exports.absoluteToRelative = absoluteToRelative;
 module.exports.makeAbsoluteUrls = makeAbsoluteUrls;
 module.exports.getProtectedSlugs = getProtectedSlugs;
 module.exports.getSubdir = getSubdir;
 module.exports.urlJoin = urlJoin;
 module.exports.urlFor = urlFor;
 module.exports.isSSL = isSSL;
-module.exports.urlPathForPost = urlPathForPost;
+module.exports.replacePermalink = replacePermalink;
 module.exports.redirectToAdmin = redirectToAdmin;
 module.exports.redirect301 = redirect301;
 module.exports.createUrl = createUrl;
+module.exports.deduplicateDoubleSlashes = deduplicateDoubleSlashes;
 
 /**
  * If you request **any** image in Ghost, it get's served via
diff --git a/core/server/services/xmlrpc.js b/core/server/services/xmlrpc.js
index cef399937d..7b53f3597d 100644
--- a/core/server/services/xmlrpc.js
+++ b/core/server/services/xmlrpc.js
@@ -28,7 +28,7 @@ var _ = require('lodash'),
 function ping(post) {
     var pingXML,
         title = post.title,
-        url = urlService.utils.urlFor('post', {post: post}, true);
+        url = urlService.getUrlByResourceId(post.id, {absolute: true});
 
     if (post.page || config.isPrivacyDisabled('useRpcPing') || settingsCache.get('is_private')) {
         return;
diff --git a/core/server/translations/en.json b/core/server/translations/en.json
index a47520345e..8c0938a303 100644
--- a/core/server/translations/en.json
+++ b/core/server/translations/en.json
@@ -172,6 +172,7 @@
         },
         "general": {
             "maintenance": "Ghost is currently undergoing maintenance, please wait a moment then retry.",
+            "maintenanceUrlService": "Ghost currently generates your blog urls. Please try again.",
             "requiredOnFuture": "This will be required in future. Please see {link}",
             "internalError": "Something went wrong.",
             "jsonParse": "Could not parse JSON: {context}."
@@ -472,7 +473,8 @@
             "settings": {
                 "yaml": {
                     "error": "Could not parse {file}: {context}.",
-                    "help": "Check your {file} file for typos and fix the named issues."
+                    "help": "Check your {file} file for typos and fix the named issues.",
+                    "validate": "The following definition \"{at}\" is invalid: {reason}"
                 },
                 "loader": "Error trying to load YAML setting for {setting} from '{path}'.",
                 "ensureSettings": "Error trying to access settings files in {path}."
diff --git a/core/server/web/middleware/error-handler.js b/core/server/web/middleware/error-handler.js
index 254491d4db..c12bd96ba5 100644
--- a/core/server/web/middleware/error-handler.js
+++ b/core/server/web/middleware/error-handler.js
@@ -2,7 +2,7 @@ var _ = require('lodash'),
     hbs = require('express-hbs'),
     config = require('../../config'),
     common = require('../../lib/common'),
-    templates = require('../../controllers/frontend/templates'),
+    helpers = require('../../services/routing/helpers'),
     escapeExpression = hbs.Utils.escapeExpression,
     _private = {},
     errorHandler = {};
@@ -98,7 +98,8 @@ _private.ThemeErrorRenderer = function ThemeErrorRenderer(err, req, res, next) {
     };
 
     // Template
-    templates.setTemplate(req, res);
+    // @TODO: very dirty !!!!!!
+    helpers.templates.setTemplate(req, res);
 
     // It can be that something went wrong with the theme or otherwise loading handlebars
     // This ensures that no matter what res.render will work here
diff --git a/core/server/web/middleware/index.js b/core/server/web/middleware/index.js
new file mode 100644
index 0000000000..4bdeff7ff7
--- /dev/null
+++ b/core/server/web/middleware/index.js
@@ -0,0 +1,5 @@
+module.exports = {
+    get maintenance() {
+        return require('./maintenance');
+    }
+};
diff --git a/core/server/web/middleware/maintenance.js b/core/server/web/middleware/maintenance.js
index 2f3bf74d9e..d5b5dad7dd 100644
--- a/core/server/web/middleware/maintenance.js
+++ b/core/server/web/middleware/maintenance.js
@@ -1,5 +1,6 @@
 var config = require('../../config'),
-    common = require('../../lib/common');
+    common = require('../../lib/common'),
+    urlService = require('../../services/url');
 
 module.exports = function maintenance(req, res, next) {
     if (config.get('maintenance').enabled) {
@@ -8,5 +9,11 @@ module.exports = function maintenance(req, res, next) {
         }));
     }
 
+    if (!urlService.hasFinished()) {
+        return next(new common.errors.MaintenanceError({
+            message: common.i18n.t('errors.general.maintenanceUrlService')
+        }));
+    }
+
     next();
 };
diff --git a/core/server/web/site/app.js b/core/server/web/site/app.js
index aa1244a48f..d0e0e8d548 100644
--- a/core/server/web/site/app.js
+++ b/core/server/web/site/app.js
@@ -123,9 +123,6 @@ module.exports = function setupSiteApp() {
 
     debug('General middleware done');
 
-    // @temporary
-    require('../../services/channels/Channels2');
-
     // Set up Frontend routes (including private blogging routes)
     siteApp.use(siteRoutes());
 
diff --git a/core/server/web/site/routes.js b/core/server/web/site/routes.js
index d5db57a8ae..8670096200 100644
--- a/core/server/web/site/routes.js
+++ b/core/server/web/site/routes.js
@@ -1,46 +1,5 @@
-var debug = require('ghost-ignition').debug('site:routes'),
-
-    routeService = require('../../services/route'),
-    siteRouter = routeService.siteRouter,
-
-    // Sub Routers
-    appRouter = routeService.appRouter,
-    channelsService = require('../../services/channels'),
-
-    // Controllers
-    controllers = require('../../controllers'),
-
-    // Utils for creating paths
-    // @TODO: refactor these away
-    urlService = require('../../services/url');
+const routing = require('../../services/routing');
 
 module.exports = function siteRoutes() {
-    // @TODO move this path out of this file!
-    // Note this also exists in api/events.js
-    // routeKeywords.preview: 'p'
-    var previewRoute = urlService.utils.urlJoin('/p', ':uuid', ':options?');
-
-    // Preview - register controller as route
-    // Ideal version, as we don't want these paths all over the place
-    // previewRoute = new Route('GET /:t_preview/:uuid/:options?', previewController);
-    // siteRouter.mountRoute(previewRoute);
-    // Orrrrr maybe preview should be an internal App??!
-    siteRouter.mountRoute(previewRoute, controllers.preview);
-
-    // Channels - register sub-router
-    // The purpose of having a parentRouter for channels, is so that we can load channels from wherever we want:
-    // config, settings, apps, etc, and that it will be possible for the router to be reloaded.
-    siteRouter.mountRouter(channelsService.router());
-
-    // Apps - register sub-router
-    // The purpose of having a parentRouter for apps, is that Apps can register a route whenever they want.
-    // Apps cannot yet deregister, it's complex to implement and I don't yet have a clear use-case for this.
-    siteRouter.mountRouter(appRouter.router());
-
-    // Default - register entry controller as route
-    siteRouter.mountRoute('*', controllers.entry);
-
-    debug('Routes:', routeService.registry.getAll());
-
-    return siteRouter.router();
+    return routing.bootstrap();
 };
diff --git a/core/test/functional/routes/channel_spec.js b/core/test/functional/routes/dynamic_routing_spec.js
similarity index 95%
rename from core/test/functional/routes/channel_spec.js
rename to core/test/functional/routes/dynamic_routing_spec.js
index 9f4d11a30e..921bcc949b 100644
--- a/core/test/functional/routes/channel_spec.js
+++ b/core/test/functional/routes/dynamic_routing_spec.js
@@ -1,19 +1,22 @@
-// # Channel Route Tests
+// # Dynamic Routing Tests
 // As it stands, these tests depend on the database, and as such are integration tests.
 // These tests are here to cover the headers sent with requests and high-level redirects that can't be
 // tested with the unit tests
-var should = require('should'),
+const should = require('should'),
     supertest = require('supertest'),
     sinon = require('sinon'),
+    moment = require('moment'),
     testUtils = require('../../utils'),
     cheerio = require('cheerio'),
     config = require('../../../../core/server/config'),
+    urlService = require('../../../../core/server/services/url'),
     settingsCache = require('../../../server/services/settings/cache'),
     ghost = testUtils.startGhost,
-    sandbox = sinon.sandbox.create(),
-    request;
+    sandbox = sinon.sandbox.create();
 
-describe('Channel Routes', function () {
+let request;
+
+describe('Dynamic Routing', function () {
     var ghostServer;
 
     function doEnd(done) {
@@ -53,7 +56,7 @@ describe('Channel Routes', function () {
         sandbox.restore();
     });
 
-    describe('Index', function () {
+    describe('Collection Index', function () {
         it('should respond with html', function (done) {
             request.get('/')
                 .expect('Content-Type', /html/)
@@ -240,6 +243,34 @@ describe('Channel Routes', function () {
         });
     });
 
+    describe('Collection Entry', function () {
+        before(function () {
+            return testUtils.initData().then(function () {
+                return testUtils.fixtures.overrideOwnerUser();
+            }).then(function () {
+                return testUtils.fixtures.insertPostsAndTags();
+            });
+        });
+
+        it('should render page with slug permalink', function (done) {
+            request.get('/static-page-test/')
+                .expect('Content-Type', /html/)
+                .expect('Cache-Control', testUtils.cacheRules.public)
+                .expect(200)
+                .end(doEnd(done));
+        });
+
+        it('should not render page with dated permalink', function (done) {
+            const date = moment().format('YYYY/MM/DD');
+
+            request.get('/' + date + '/static-page-test/')
+                .expect('Content-Type', /html/)
+                .expect('Cache-Control', testUtils.cacheRules.private)
+                .expect(404)
+                .end(doEnd(done));
+        });
+    });
+
     describe('Tag', function () {
         before(function (done) {
             testUtils.clearData().then(function () {
@@ -325,6 +356,32 @@ describe('Channel Routes', function () {
             });
         });
 
+        describe('Edit', function () {
+            it('should redirect without slash', function (done) {
+                request.get('/tag/getting-started/edit')
+                    .expect('Location', '/tag/getting-started/edit/')
+                    .expect('Cache-Control', testUtils.cacheRules.year)
+                    .expect(301)
+                    .end(doEnd(done));
+            });
+
+            it('should redirect to tag settings', function (done) {
+                request.get('/tag/getting-started/edit/')
+                    .expect('Location', '/ghost/#/settings/tags/getting-started/')
+                    .expect('Cache-Control', testUtils.cacheRules.public)
+                    .expect(302)
+                    .end(doEnd(done));
+            });
+
+            it('should 404 for non-edit parameter', function (done) {
+                request.get('/tag/getting-started/notedit/')
+                    .expect('Cache-Control', testUtils.cacheRules.private)
+                    .expect(404)
+                    .expect(/Page not found/)
+                    .end(doEnd(done));
+            });
+        });
+
         describe('Paged', function () {
             before(testUtils.teardown);
 
@@ -409,32 +466,6 @@ describe('Channel Routes', function () {
                 });
             });
         });
-
-        describe('Edit', function () {
-            it('should redirect without slash', function (done) {
-                request.get('/tag/getting-started/edit')
-                    .expect('Location', '/tag/getting-started/edit/')
-                    .expect('Cache-Control', testUtils.cacheRules.year)
-                    .expect(301)
-                    .end(doEnd(done));
-            });
-
-            it('should redirect to tag settings', function (done) {
-                request.get('/tag/getting-started/edit/')
-                    .expect('Location', '/ghost/#/settings/tags/getting-started/')
-                    .expect('Cache-Control', testUtils.cacheRules.public)
-                    .expect(302)
-                    .end(doEnd(done));
-            });
-
-            it('should 404 for non-edit parameter', function (done) {
-                request.get('/tag/getting-started/notedit/')
-                    .expect('Cache-Control', testUtils.cacheRules.private)
-                    .expect(404)
-                    .expect(/Page not found/)
-                    .end(doEnd(done));
-            });
-        });
     });
 
     describe('Author', function () {
@@ -549,6 +580,32 @@ describe('Channel Routes', function () {
             });
         });
 
+        describe('Edit', function () {
+            it('should redirect without slash', function (done) {
+                request.get('/author/ghost-owner/edit')
+                    .expect('Location', '/author/ghost-owner/edit/')
+                    .expect('Cache-Control', testUtils.cacheRules.year)
+                    .expect(301)
+                    .end(doEnd(done));
+            });
+
+            it('should redirect to editor', function (done) {
+                request.get('/author/ghost-owner/edit/')
+                    .expect('Location', '/ghost/#/team/ghost-owner/')
+                    .expect('Cache-Control', testUtils.cacheRules.public)
+                    .expect(302)
+                    .end(doEnd(done));
+            });
+
+            it('should 404 for something that isn\'t edit', function (done) {
+                request.get('/author/ghost-owner/notedit/')
+                    .expect('Cache-Control', testUtils.cacheRules.private)
+                    .expect(404)
+                    .expect(/Page not found/)
+                    .end(doEnd(done));
+            });
+        });
+
         describe('Paged', function () {
             // Add enough posts to trigger pages
             before(function (done) {
@@ -634,31 +691,5 @@ describe('Channel Routes', function () {
                 });
             });
         });
-
-        describe('Edit', function () {
-            it('should redirect without slash', function (done) {
-                request.get('/author/ghost-owner/edit')
-                    .expect('Location', '/author/ghost-owner/edit/')
-                    .expect('Cache-Control', testUtils.cacheRules.year)
-                    .expect(301)
-                    .end(doEnd(done));
-            });
-
-            it('should redirect to editor', function (done) {
-                request.get('/author/ghost-owner/edit/')
-                    .expect('Location', '/ghost/#/team/ghost-owner/')
-                    .expect('Cache-Control', testUtils.cacheRules.public)
-                    .expect(302)
-                    .end(doEnd(done));
-            });
-
-            it('should 404 for something that isn\'t edit', function (done) {
-                request.get('/author/ghost-owner/notedit/')
-                    .expect('Cache-Control', testUtils.cacheRules.private)
-                    .expect(404)
-                    .expect(/Page not found/)
-                    .end(doEnd(done));
-            });
-        });
     });
 });
diff --git a/core/test/functional/routes/frontend_spec.js b/core/test/functional/routes/frontend_spec.js
index 5cb1192cfb..40feb5c12d 100644
--- a/core/test/functional/routes/frontend_spec.js
+++ b/core/test/functional/routes/frontend_spec.js
@@ -214,6 +214,7 @@ describe('Frontend Routing', function () {
                         should.not.exist(res.headers['set-cookie']);
                         should.exist(res.headers.date);
 
+                        // NOTE: This is the title from the settings.
                         $('title').text().should.equal('Welcome to Ghost');
 
                         // @TODO: change or remove?
@@ -301,6 +302,7 @@ describe('Frontend Routing', function () {
                         should.exist(res.headers.date);
 
                         $('title').text().should.equal('Welcome to Ghost');
+
                         $('.content .post').length.should.equal(1);
                         $('.poweredby').text().should.equal('Proudly published with Ghost');
                         $('body.amp-template').length.should.equal(1);
diff --git a/core/test/integration/api/api_posts_spec.js b/core/test/integration/api/api_posts_spec.js
index d3cf838a0e..e7a7c980bb 100644
--- a/core/test/integration/api/api_posts_spec.js
+++ b/core/test/integration/api/api_posts_spec.js
@@ -9,6 +9,7 @@ var should = require('should'),
     db = require('../../../server/data/db'),
     models = require('../../../server/models'),
     PostAPI = require('../../../server/api/posts'),
+    urlService = require('../../../server/services/url'),
     settingsCache = require('../../../server/services/settings/cache'),
 
     sandbox = sinon.sandbox.create();
@@ -422,6 +423,8 @@ describe('Post API', function () {
         });
 
         it('with context.user can fetch url and author fields', function (done) {
+            sandbox.stub(urlService, 'getUrlByResourceId').withArgs(testUtils.DataGenerator.Content.posts[7].id).returns('/html-ipsum/');
+
             PostAPI.browse({context: {user: 1}, status: 'all', limit: 5}).then(function (results) {
                 should.exist(results.posts);
 
diff --git a/core/test/integration/data/importer/importers/data_spec.js b/core/test/integration/data/importer/importers/data_spec.js
index f6408fb6f6..94992e223f 100644
--- a/core/test/integration/data/importer/importers/data_spec.js
+++ b/core/test/integration/data/importer/importers/data_spec.js
@@ -220,7 +220,11 @@ describe('Import', function () {
             testUtils.fixtures.loadExportFixture('export-001', {lts: true}).then(function (exported) {
                 exportData = exported;
                 return dataImporter.doImport(exportData, importOptions);
-            }).then(function () {
+            }).then(function (result) {
+                // NOTE: the user in the JSON is not imported (!) - duplicate email
+                result.problems[1].help.should.eql('User');
+                result.problems[1].message.should.eql('Entry was not imported and ignored. Detected duplicated entry.');
+
                 // Grab the data from tables
                 return Promise.all([
                     knex('users').select(),
@@ -248,10 +252,9 @@ describe('Import', function () {
                     hashedPassword: users[0].password,
                     plainPassword: testUtils.DataGenerator.Content.users[0].password
                 }).then(function () {
-                    // but the name, slug, and bio should have been overridden
                     users[0].name.should.equal(exportData.data.users[0].name);
                     users[0].slug.should.equal(exportData.data.users[0].slug);
-                    should.not.exist(users[0].bio, 'bio is not imported');
+                    users[0].email.should.equal(exportData.data.users[0].email);
 
                     // import no longer requires all data to be dropped, and adds posts
                     posts.length.should.equal(exportData.data.posts.length, 'Wrong number of posts');
@@ -323,7 +326,11 @@ describe('Import', function () {
             testUtils.fixtures.loadExportFixture('export-002', {lts: true}).then(function (exported) {
                 exportData = exported;
                 return dataImporter.doImport(exportData, importOptions);
-            }).then(function () {
+            }).then(function (result) {
+                // NOTE: the user in the JSON is not imported (!) - duplicate email
+                result.problems[1].help.should.eql('User');
+                result.problems[1].message.should.eql('Entry was not imported and ignored. Detected duplicated entry.');
+
                 // Grab the data from tables
                 return Promise.all([
                     knex('users').select(),
@@ -351,10 +358,9 @@ describe('Import', function () {
                     hashedPassword: users[0].password,
                     plainPassword: testUtils.DataGenerator.Content.users[0].password
                 }).then(function () {
-                    // but the name, slug, and bio should have been overridden
                     users[0].name.should.equal(exportData.data.users[0].name);
                     users[0].slug.should.equal(exportData.data.users[0].slug);
-                    should.not.exist(users[0].bio, 'bio is not imported');
+                    users[0].email.should.equal(exportData.data.users[0].email);
 
                     // import no longer requires all data to be dropped, and adds posts
                     posts.length.should.equal(exportData.data.posts.length, 'Wrong number of posts');
@@ -390,7 +396,11 @@ describe('Import', function () {
             testUtils.fixtures.loadExportFixture('export-003', {lts: true}).then(function (exported) {
                 exportData = exported;
                 return dataImporter.doImport(exportData, importOptions);
-            }).then(function () {
+            }).then(function (result) {
+                // NOTE: the user in the JSON is not imported (!) - duplicate email
+                result.problems[1].help.should.eql('User');
+                result.problems[1].message.should.eql('Entry was not imported and ignored. Detected duplicated entry.');
+
                 // Grab the data from tables
                 return Promise.all([
                     knex('users').select(),
@@ -413,10 +423,9 @@ describe('Import', function () {
                     hashedPassword: users[0].password,
                     plainPassword: testUtils.DataGenerator.Content.users[0].password
                 }).then(function () {
-                    // but the name, slug, and bio should have been overridden
                     users[0].name.should.equal(exportData.data.users[0].name);
                     users[0].slug.should.equal(exportData.data.users[0].slug);
-                    should.not.exist(users[0].bio, 'bio is not imported');
+                    users[0].email.should.equal(exportData.data.users[0].email);
 
                     // test posts
                     posts.length.should.equal(1, 'Wrong number of posts');
@@ -521,10 +530,8 @@ describe('Import', function () {
                     hashedPassword: users[0].password,
                     plainPassword: testUtils.DataGenerator.Content.users[0].password
                 }).then(function () {
-                    // but the name, slug, and bio should have been overridden
                     users[0].name.should.equal('Joe Bloggs');
                     users[0].slug.should.equal('joe-bloggs');
-                    should.not.exist(users[0].bio, 'bio is not imported');
 
                     // test posts
                     posts.length.should.equal(1, 'Wrong number of posts');
diff --git a/core/test/unit/helpers/ghost_head_spec.js b/core/test/integration/helpers/ghost_head_spec.js
similarity index 79%
rename from core/test/unit/helpers/ghost_head_spec.js
rename to core/test/integration/helpers/ghost_head_spec.js
index c98b4db296..cedfb02d35 100644
--- a/core/test/unit/helpers/ghost_head_spec.js
+++ b/core/test/integration/helpers/ghost_head_spec.js
@@ -1,60 +1,337 @@
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
     _ = require('lodash'),
-    Promise = require('bluebird'),
     moment = require('moment'),
     testUtils = require('../../utils'),
     configUtils = require('../../utils/configUtils'),
     models = require('../../../server/models'),
+    routing = require('../../../server/services/routing'),
     helpers = require('../../../server/helpers'),
-    imageLib = require('../../../server/lib/image'),
     proxy = require('../../../server/helpers/proxy'),
     settingsCache = proxy.settingsCache,
-    api = proxy.api,
-    labs = proxy.labs,
-
     sandbox = sinon.sandbox.create();
 
+/**
+ * @TODO: this is not a full unit test. it's a half integration test, because we don't mock "getMetaData"!!
+ *        either move to integration tests or rewrite!!!
+ */
 describe('{{ghost_head}} helper', function () {
+    let posts = [], tags = [], users = [], knexMock, firstCollection;
+
     before(function () {
         models.init();
+
+        firstCollection = sandbox.stub();
+        firstCollection.getRssUrl = sandbox.stub().returns('http://localhost:65530/rss/');
+        sandbox.stub(routing.registry, 'getFirstCollectionRouter').returns(firstCollection);
+
+        testUtils.integrationTesting.defaultMocks(sandbox);
+
+        settingsCache.get.withArgs('title').returns('Ghost');
+        settingsCache.get.withArgs('description').returns('blog description');
+        settingsCache.get.withArgs('cover_image').returns('/content/images/blog-cover.png');
+        settingsCache.get.withArgs('amp').returns(true);
+
+        knexMock = new testUtils.mocks.knex();
+        knexMock.mock();
+
+        return models.Post.add(testUtils.DataGenerator.forKnex.createPost({
+            meta_description: 'all about our blog',
+            title: 'About',
+            feature_image: '/content/images/test-image-about.png',
+            page: true,
+            authors: [testUtils.DataGenerator.forKnex.createUser({
+                profile_image: '/content/images/test-author-image.png',
+                website: 'http://authorwebsite.com',
+                facebook: 'testuser',
+                twitter: '@testuser',
+            })]
+        }), {withRelated: ['authors']}).then(function (post) {
+            posts.push(post.toJSON());
+
+            return models.Post.add(testUtils.DataGenerator.forKnex.createPost({
+                meta_description: 'all about our blog',
+                title: 'About',
+                feature_image: '/content/images/test-image-about.png',
+                og_image: '/content/images/test-og-image.png',
+                og_title: 'Custom Facebook title',
+                og_description: 'Custom Facebook description',
+                twitter_image: '/content/images/test-twitter-image.png',
+                twitter_title: 'Custom Twitter title',
+                twitter_description: 'Custom Twitter description',
+                page: true,
+                authors: [testUtils.DataGenerator.forKnex.createUser({
+                    profile_image: '/content/images/test-author-image.png',
+                    website: 'http://authorwebsite.com',
+                    facebook: 'testuser',
+                    twitter: '@testuser'
+                })]
+            }), {withRelated: ['authors']});
+        }).then(function (post) {
+            posts.push(post.toJSON());
+
+            return models.Post.add(testUtils.DataGenerator.forKnex.createPost({
+                meta_description: 'blog description',
+                title: 'Welcome to Ghost',
+                feature_image: '/content/images/test-image.png',
+                og_title: 'Custom Facebook title',
+                og_description: 'Custom Facebook description',
+                twitter_image: '/content/images/test-twitter-image.png',
+                published_at: moment('2008-05-31T19:18:15').toDate(),
+                updated_at: moment('2014-10-06T15:23:54').toDate(),
+                tags: [
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag1'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag2'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag3'})
+                ],
+                authors: [testUtils.DataGenerator.forKnex.createUser({
+                    name: 'Author name',
+                    slug: 'author2',
+                    profile_image: '/content/images/test-author-image.png',
+                    website: 'http://authorwebsite.com',
+                    bio: 'Author bio',
+                    facebook: 'testuser',
+                    twitter: '@testuser'
+                })]
+            }), {withRelated: ['authors', 'tags']});
+        }).then(function (post) {
+            posts.push(post.toJSON());
+
+            return models.Post.add(testUtils.DataGenerator.forKnex.createPost({
+                meta_description: 'blog description',
+                custom_excerpt: 'post custom excerpt',
+                title: 'Welcome to Ghost',
+                feature_image: '/content/images/test-image.png',
+                og_image: '/content/images/test-facebook-image.png',
+                twitter_image: '/content/images/test-twitter-image.png',
+                twitter_title: 'Custom Twitter title',
+                tags: [
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag1'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag2'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag3'})
+                ],
+                authors: [
+                    testUtils.DataGenerator.forKnex.createUser({
+                        name: 'Author name',
+                        url: 'http://testauthorurl.com',
+                        slug: 'author3',
+                        profile_image: '/content/images/test-author-image.png',
+                        website: 'http://authorwebsite.com',
+                        facebook: 'testuser',
+                        twitter: '@testuser',
+                        bio: 'Author bio'
+                    })
+                ]
+            }), {withRelated: ['authors', 'tags']});
+        }).then(function (post) {
+            posts.push(post.toJSON());
+
+            return models.Post.add(testUtils.DataGenerator.forKnex.createPost({
+                title: 'Welcome to Ghost',
+                mobiledoc: testUtils.DataGenerator.markdownToMobiledoc('This is a short post'),
+                authors: [
+                    testUtils.DataGenerator.forKnex.createUser({
+                        name: 'Author name',
+                        url: 'http://testauthorurl.com',
+                        slug: 'author4',
+                        profile_image: '/content/images/test-author-image.png',
+                        website: 'http://authorwebsite.com',
+                        facebook: 'testuser',
+                        twitter: '@testuser'
+                    })
+                ]
+            }), {withRelated: ['authors', 'tags']});
+        }).then(function (post) {
+            posts.push(post.toJSON());
+
+            return models.Post.add(testUtils.DataGenerator.forKnex.createPost({
+                meta_description: 'blog description',
+                title: 'Welcome to Ghost',
+                feature_image: '/content/images/test-image.png',
+                og_image: '/content/images/test-facebook-image.png',
+                og_title: 'Custom Facebook title',
+                twitter_image: '/content/images/test-twitter-image.png',
+                twitter_title: 'Custom Twitter title',
+                tags: [
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag1'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag2'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag3'})
+                ],
+                authors: [
+                    testUtils.DataGenerator.forKnex.createUser({
+                        name: 'Author name',
+                        url: 'http://testauthorurl.com',
+                        slug: 'author5',
+                        profile_image: '/content/images/test-author-image.png',
+                        website: 'http://authorwebsite.com',
+                        facebook: 'testuser',
+                        twitter: '@testuser'
+                    })
+                ]
+            }), {withRelated: ['authors', 'tags']});
+        }).then(function (post) {
+            posts.push(post.toJSON());
+
+            return models.Post.add(testUtils.DataGenerator.forKnex.createPost({
+                meta_description: 'blog "test" description',
+                title: 'title',
+                meta_title: 'Welcome to Ghost "test"',
+                feature_image: '/content/images/test-image.png',
+                tags: [
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag1'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag2'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag3'})
+                ],
+                authors: [
+                    testUtils.DataGenerator.forKnex.createUser({
+                        name: 'Author name',
+                        url: 'http://testauthorurl.com',
+                        slug: 'author6',
+                        profile_image: '/content/images/test-author-image.png',
+                        website: 'http://authorwebsite.com',
+                        facebook: 'testuser',
+                        twitter: '@testuser'
+                    })
+                ]
+            }), {withRelated: ['authors', 'tags']});
+        }).then(function (post) {
+            posts.push(post.toJSON());
+
+            return models.Post.add(testUtils.DataGenerator.forKnex.createPost({
+                meta_description: 'blog description',
+                title: 'Welcome to Ghost',
+                feature_image: '/content/images/test-image.png',
+                tags: [],
+                authors: [
+                    testUtils.DataGenerator.forKnex.createUser({
+                        name: 'Author name',
+                        url: 'http://testauthorurl.com',
+                        slug: 'author7',
+                        profile_image: '/content/images/test-author-image.png',
+                        website: 'http://authorwebsite.com',
+                        facebook: 'testuser',
+                        twitter: '@testuser'
+                    })
+                ]
+            }), {withRelated: ['authors', 'tags']});
+        }).then(function (post) {
+            posts.push(post.toJSON());
+
+            return models.Post.add(testUtils.DataGenerator.forKnex.createPost({
+                meta_description: 'blog description',
+                title: 'Welcome to Ghost',
+                feature_image: null,
+                tags: [
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag1'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag2'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag3'})
+                ],
+                authors: [
+                    testUtils.DataGenerator.forKnex.createUser({
+                        name: 'Author name',
+                        url: 'http://testauthorurl.com',
+                        slug: 'author8',
+                        profile_image: null,
+                        website: 'http://authorwebsite.com',
+                        facebook: 'testuser',
+                        twitter: '@testuser'
+                    })
+                ]
+            }), {withRelated: ['authors', 'tags']});
+        }).then(function (post) {
+            posts.push(post.toJSON());
+
+            return models.Post.add(testUtils.DataGenerator.forKnex.createPost({
+                title: 'Welcome to Ghost',
+                mobiledoc: testUtils.DataGenerator.markdownToMobiledoc('This is a short post'),
+                tags: [
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag1'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag2'}),
+                    testUtils.DataGenerator.forKnex.createTag({name: 'tag3'})
+                ],
+                authors: [
+                    testUtils.DataGenerator.forKnex.createUser({
+                        name: 'Author name'
+                    })
+                ]
+            }), {withRelated: ['authors', 'tags']});
+        }).then(function (post) {
+            posts.push(post.toJSON());
+
+            return models.Tag.add(testUtils.DataGenerator.forKnex.createTag({
+                meta_description: 'tag meta description',
+                name: 'tagtitle',
+                meta_title: 'tag meta title',
+                feature_image: '/content/images/tag-image.png'
+            }));
+        }).then(function (tag) {
+            tags.push(tag.toJSON());
+
+            return models.Tag.add(testUtils.DataGenerator.forKnex.createTag({
+                meta_description: '',
+                description: 'tag description',
+                name: 'tagtitle',
+                meta_title: '',
+                feature_image: '/content/images/tag-image.png'
+            }));
+        }).then(function (tag) {
+            tags.push(tag.toJSON());
+
+            return models.Tag.add(testUtils.DataGenerator.forKnex.createTag({
+                meta_description: '',
+                name: 'tagtitle',
+                meta_title: '',
+                feature_image: '/content/images/tag-image.png'
+            }));
+        }).then(function (tag) {
+            tags.push(tag.toJSON());
+
+            return models.Tag.add(testUtils.DataGenerator.forKnex.createTag({
+                meta_description: 'tag meta description',
+                title: 'tagtitle',
+                meta_title: 'tag meta title',
+                feature_image: '/content/images/tag-image.png'
+            }));
+        }).then(function (tag) {
+            tags.push(tag.toJSON());
+
+            return models.User.add(testUtils.DataGenerator.forKnex.createUser({
+                name: 'Author name',
+                slug: 'AuthorName',
+                bio: 'Author bio',
+                profile_image: '/content/images/test-author-image.png',
+                cover_image: '/content/images/author-cover-image.png',
+                website: 'http://authorwebsite.com',
+                facebook: 'testuser',
+                twitter: '@testuser'
+            }));
+        }).then(function (user) {
+            users.push(user.toJSON());
+
+            return models.User.add(testUtils.DataGenerator.forKnex.createUser({
+                name: 'Author name',
+                slug: 'AuthorName1',
+                bio: 'Author bio',
+                profile_image: '/content/images/test-author-image.png',
+                cover_image: '/content/images/author-cover-image.png',
+                website: 'http://authorwebsite.com'
+            }));
+        }).then(function (user) {
+            users.push(user.toJSON());
+        }).finally(function () {
+            return testUtils.integrationTesting.urlService.init();
+        });
     });
 
-    afterEach(function () {
+    after(function () {
+        knexMock.unmock();
+        testUtils.integrationTesting.urlService.resetGenerators();
         sandbox.restore();
         configUtils.restore();
     });
 
-    beforeEach(function () {
-        /**
-         * Each test case here requests the image dimensions.
-         * The image path is e.g. localhost:port/favicon.ico, but no server is running.
-         * If we don't mock the image size utility, we run into lot's of timeouts.
-         */
-        sandbox.stub(imageLib.imageSize, 'getImageSizeFromUrl').resolves();
-
-        sandbox.stub(api.clients, 'read').returns(Promise.resolve({
-            clients: [
-                {slug: 'ghost-frontend', secret: 'a1bcde23cfe5', status: 'enabled'}
-            ]
-        }));
-
-        sandbox.stub(labs, 'isSet').returns(true);
-    });
-
     describe('without Code Injection', function () {
-        var localSettingsCache = {
-            title: 'Ghost',
-            description: 'blog description',
-            cover_image: '/content/images/blog-cover.png',
-            amp: true
-        };
-
-        beforeEach(function () {
-            sandbox.stub(settingsCache, 'get').callsFake(function (key) {
-                return localSettingsCache[key];
-            });
-
+        before(function () {
             configUtils.set('url', 'http://localhost:65530/');
         });
 
@@ -120,30 +397,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('returns structured data on static page', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'all about our blog',
-                    title: 'About',
-                    feature_image: '/content/images/test-image-about.png',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    og_image: '',
-                    og_title: '',
-                    og_description: '',
-                    twitter_image: '',
-                    twitter_title: '',
-                    twitter_description: '',
-                    page: true,
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http://testauthorurl.com',
-                        slug: 'Author',
-                        profile_image: '/content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        facebook: 'testuser',
-                        twitter: '@testuser',
-                        bio: 'Author bio'
-                    }
-                }
+                post: posts[0]
             };
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -192,30 +446,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('returns structured data on static page with custom post structured data', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'all about our blog',
-                    title: 'About',
-                    feature_image: '/content/images/test-image-about.png',
-                    og_image: '/content/images/test-og-image.png',
-                    og_title: 'Custom Facebook title',
-                    og_description: 'Custom Facebook description',
-                    twitter_image: '/content/images/test-twitter-image.png',
-                    twitter_title: 'Custom Twitter title',
-                    twitter_description: 'Custom Twitter description',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    page: true,
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http://testauthorurl.com',
-                        slug: 'Author',
-                        profile_image: '/content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        facebook: 'testuser',
-                        twitter: '@testuser',
-                        bio: 'Author bio'
-                    }
-                }
+                post: posts[1]
             };
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -262,294 +493,9 @@ describe('{{ghost_head}} helper', function () {
             }).catch(done);
         });
 
-        it('returns structured data and schema first tag page with meta description and meta title', function (done) {
-            var renderObject = {
-                tag: {
-                    meta_description: 'tag meta description',
-                    name: 'tagtitle',
-                    meta_title: 'tag meta title',
-                    feature_image: '/content/images/tag-image.png'
-                }
-            };
-
-            helpers.ghost_head(testUtils.createHbsResponse({
-                renderObject: renderObject,
-                locals: {
-                    relativeUrl: '/tag/tagtitle/',
-                    context: ['tag'],
-                    safeVersion: '0.3'
-                }
-            })).then(function (rendered) {
-                should.exist(rendered);
-                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
-                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
-                rendered.string.should.match(/<meta name="description" content="tag meta description" \/>/);
-                rendered.string.should.match(/<meta property="og:site_name" content="Ghost" \/>/);
-                rendered.string.should.match(/<meta property="og:type" content="website" \/>/);
-                rendered.string.should.match(/<meta property="og:title" content="tag meta title" \/>/);
-                rendered.string.should.match(/<meta property="og:description" content="tag meta description" \/>/);
-                rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
-                rendered.string.should.match(/<meta property="og:image" content="http:\/\/localhost:65530\/content\/images\/tag-image.png" \/>/);
-                rendered.string.should.match(/<meta name="twitter:card" content="summary_large_image" \/>/);
-                rendered.string.should.match(/<meta name="twitter:title" content="tag meta title" \/>/);
-                rendered.string.should.match(/<meta name="twitter:description" content="tag meta description" \/>/);
-                rendered.string.should.match(/<meta name="twitter:url" content="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
-                rendered.string.should.match(/<meta name="twitter:image" content="http:\/\/localhost:65530\/content\/images\/tag-image.png" \/>/);
-                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
-                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
-                rendered.string.should.match(/<script type=\"application\/ld\+json\">/);
-                rendered.string.should.match(/"@context": "https:\/\/schema.org"/);
-                rendered.string.should.match(/"@type": "Series"/);
-                rendered.string.should.match(/"publisher": {\n        "@type": "Organization",\n        "name": "Ghost",/);
-                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/tag\/tagtitle\/"/);
-                rendered.string.should.match(/"image": "http:\/\/localhost:65530\/content\/images\/tag-image.png"/);
-                rendered.string.should.match(/"name": "tagtitle"/);
-                rendered.string.should.match(/"description": "tag meta description"/);
-
-                done();
-            }).catch(done);
-        });
-
-        it('tag first page without meta data if no meta title and meta description, but model description provided', function (done) {
-            var renderObject = {
-                tag: {
-                    meta_description: '',
-                    description: 'tag description',
-                    name: 'tagtitle',
-                    meta_title: '',
-                    feature_image: '/content/images/tag-image.png'
-                }
-            };
-
-            helpers.ghost_head(testUtils.createHbsResponse({
-                renderObject: renderObject,
-                locals: {
-                    relativeUrl: '/tag/tagtitle/',
-                    context: ['tag'],
-                    safeVersion: '0.3'
-                }
-            })).then(function (rendered) {
-                should.exist(rendered);
-                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
-                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
-                rendered.string.should.not.match(/<meta name="description"/);
-                rendered.string.should.match(/<meta property="og:site_name" content="Ghost" \/>/);
-                rendered.string.should.match(/<meta property="og:type" content="website" \/>/);
-                rendered.string.should.match(/<meta property="og:title" content="tagtitle - Ghost" \/>/);
-                rendered.string.should.not.match(/<meta property="og:description"/);
-                rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
-                rendered.string.should.match(/<meta property="og:image" content="http:\/\/localhost:65530\/content\/images\/tag-image.png" \/>/);
-                rendered.string.should.match(/<meta name="twitter:card" content="summary_large_image" \/>/);
-                rendered.string.should.match(/<meta name="twitter:title" content="tagtitle - Ghost" \/>/);
-                rendered.string.should.not.match(/<meta name="twitter:description"/);
-                rendered.string.should.match(/<meta name="twitter:url" content="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
-                rendered.string.should.match(/<meta name="twitter:image" content="http:\/\/localhost:65530\/content\/images\/tag-image.png" \/>/);
-                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
-                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
-                rendered.string.should.match(/<script type=\"application\/ld\+json\">/);
-                rendered.string.should.match(/"@context": "https:\/\/schema.org"/);
-                rendered.string.should.match(/"@type": "Series"/);
-                rendered.string.should.match(/"publisher": {\n        "@type": "Organization",\n        "name": "Ghost",/);
-                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/tag\/tagtitle\/"/);
-                rendered.string.should.match(/"image": "http:\/\/localhost:65530\/content\/images\/tag-image.png"/);
-                rendered.string.should.match(/"name": "tagtitle"/);
-                rendered.string.should.not.match(/"description":/);
-
-                done();
-            }).catch(done);
-        });
-
-        it('tag first page without meta and model description returns no description fields', function (done) {
-            var renderObject = {
-                tag: {
-                    meta_description: '',
-                    name: 'tagtitle',
-                    meta_title: '',
-                    feature_image: '/content/images/tag-image.png'
-                }
-            };
-
-            helpers.ghost_head(testUtils.createHbsResponse({
-                renderObject: renderObject,
-                locals: {
-                    relativeUrl: '/tag/tagtitle/',
-                    context: ['tag'],
-                    safeVersion: '0.3'
-                }
-            })).then(function (rendered) {
-                should.exist(rendered);
-                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
-                rendered.string.should.not.match(/<meta name="description"/);
-                rendered.string.should.not.match(/<meta property="og:description"/);
-                rendered.string.should.not.match(/<meta name="twitter:description"/);
-                rendered.string.should.not.match(/"description":/);
-
-                done();
-            }).catch(done);
-        });
-
-        it('does not return structured data on paginated tag pages', function (done) {
-            var renderObject = {
-                tag: {
-                    meta_description: 'tag meta description',
-                    title: 'tagtitle',
-                    meta_title: 'tag meta title',
-                    feature_image: '/content/images/tag-image.png'
-                }
-            };
-
-            helpers.ghost_head(testUtils.createHbsResponse({
-                renderObject: renderObject,
-                locals: {
-                    relativeUrl: '/tag/tagtitle/page/2/',
-                    context: ['paged', 'tag'],
-                    safeVersion: '0.3'
-                }
-            })).then(function (rendered) {
-                should.exist(rendered);
-                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
-                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/tag\/tagtitle\/page\/2\/" \/>/);
-                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
-                rendered.string.should.not.match(/<meta name="description" content="tag meta description" \/>/);
-                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
-                rendered.string.should.not.match(/<meta property="og/);
-                rendered.string.should.not.match(/<script type=\"application\/ld\+json\">/);
-
-                done();
-            }).catch(done);
-        });
-
-        it('returns structured data and schema on first author page with cover image', function (done) {
-            var renderObject = {
-                author: {
-                    name: 'Author name',
-                    slug: 'AuthorName',
-                    bio: 'Author bio',
-                    profile_image: '/content/images/test-author-image.png',
-                    cover_image: '/content/images/author-cover-image.png',
-                    website: 'http://authorwebsite.com',
-                    facebook: 'testuser',
-                    twitter: '@testuser'
-                }
-            }, authorBk = _.cloneDeep(renderObject.author);
-
-            helpers.ghost_head(testUtils.createHbsResponse({
-                renderObject: renderObject,
-                locals: {
-                    relativeUrl: '/author/AuthorName/',
-                    context: ['author'],
-                    safeVersion: '0.3'
-                }
-            })).then(function (rendered) {
-                should.exist(rendered);
-                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
-                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/author\/AuthorName\/" \/>/);
-                rendered.string.should.not.match(/<meta name="description"/);
-                rendered.string.should.match(/<meta property="og:site_name" content="Ghost" \/>/);
-                rendered.string.should.match(/<meta property="og:type" content="profile" \/>/);
-                rendered.string.should.not.match(/<meta property="og:description"/);
-                rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/author\/AuthorName\/" \/>/);
-                rendered.string.should.match(/<meta property="og:image" content="http:\/\/localhost:65530\/content\/images\/author-cover-image.png" \/>/);
-                rendered.string.should.match(/<meta property="article:author" content="https:\/\/www.facebook.com\/testuser\" \/>/);
-                rendered.string.should.match(/<meta name="twitter:card" content="summary_large_image" \/>/);
-                rendered.string.should.match(/<meta name="twitter:title" content="Author name - Ghost" \/>/);
-                rendered.string.should.not.match(/<meta name="twitter:description"/);
-                rendered.string.should.match(/<meta name="twitter:url" content="http:\/\/localhost:65530\/author\/AuthorName\/" \/>/);
-                rendered.string.should.match(/<meta name="twitter:creator" content="@testuser" \/>/);
-                rendered.string.should.match(/<meta name="twitter:image" content="http:\/\/localhost:65530\/content\/images\/author-cover-image.png" \/>/);
-                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
-                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
-                rendered.string.should.match(/<script type=\"application\/ld\+json\">/);
-                rendered.string.should.match(/"@context": "https:\/\/schema.org"/);
-                rendered.string.should.match(/"@type": "Person"/);
-                rendered.string.should.match(/"sameAs": \[\n        "http:\/\/authorwebsite.com",\n        "https:\/\/www.facebook.com\/testuser",\n        "https:\/\/twitter.com\/testuser"\n    \]/);
-                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/AuthorName\/"/);
-                rendered.string.should.match(/"image": "http:\/\/localhost:65530\/content\/images\/author-cover-image.png"/);
-                rendered.string.should.match(/"name": "Author name"/);
-                rendered.string.should.not.match(/"description":/);
-
-                renderObject.author.should.eql(authorBk);
-
-                done();
-            }).catch(done);
-        });
-
-        it('does not return structured data on paginated author pages', function (done) {
-            var renderObject = {
-                author: {
-                    name: 'Author name',
-                    slug: 'AuthorName',
-                    bio: 'Author bio',
-                    profile_image: '/content/images/test-author-image.png',
-                    cover_image: '/content/images/author-cover-image.png',
-                    website: 'http://authorwebsite.com'
-                }
-            };
-
-            helpers.ghost_head(testUtils.createHbsResponse({
-                renderObject: renderObject,
-                locals: {
-                    relativeUrl: '/author/AuthorName/page/2/',
-                    context: ['paged', 'author'],
-                    safeVersion: '0.3'
-                }
-            })).then(function (rendered) {
-                should.exist(rendered);
-                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
-                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/author\/AuthorName\/page\/2\/" \/>/);
-                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
-                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
-                rendered.string.should.not.match(/<meta name="description" /);
-                rendered.string.should.not.match(/<meta property="og/);
-                rendered.string.should.not.match(/<script type=\"application\/ld\+json\">/);
-
-                done();
-            }).catch(done);
-        });
-
-        it('returns meta tag string even if safeVersion is invalid', function (done) {
-            helpers.ghost_head(testUtils.createHbsResponse({
-                locals: {
-                    context: [],
-                    safeVersion: '0.9'
-                }
-            })).then(function (rendered) {
-                should.exist(rendered);
-                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
-                rendered.string.should.match(/<meta name="generator" content="Ghost 0.9" \/>/);
-                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
-
-                done();
-            }).catch(done);
-        });
-
         it('returns structured data on post page with author image and post cover image', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'blog description',
-                    custom_excerpt: '',
-                    title: 'Welcome to Ghost',
-                    feature_image: '/content/images/test-image.png',
-                    og_image: '',
-                    og_title: 'Custom Facebook title',
-                    og_description: 'Custom Facebook description',
-                    twitter_image: '/content/images/test-twitter-image.png',
-                    twitter_title: '',
-                    twitter_description: '',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    tags: [{name: 'tag1'}, {name: 'tag2'}, {name: 'tag3'}],
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http://testauthorurl.com',
-                        slug: 'Author',
-                        profile_image: '/content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        bio: 'Author bio',
-                        facebook: 'testuser',
-                        twitter: '@testuser'
-                    }
-                }
+                post: posts[2]
             }, postBk = _.cloneDeep(renderObject.post);
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -560,10 +506,10 @@ describe('{{ghost_head}} helper', function () {
                     safeVersion: '0.3'
                 }
             })).then(function (rendered) {
-                var re1 = new RegExp('<meta property="article:published_time" content="' + renderObject.post.published_at),
-                    re2 = new RegExp('<meta property="article:modified_time" content="' + renderObject.post.updated_at),
-                    re3 = new RegExp('"datePublished": "' + renderObject.post.published_at),
-                    re4 = new RegExp('"dateModified": "' + renderObject.post.updated_at);
+                var re1 = new RegExp('<meta property="article:published_time" content="' + new Date(renderObject.post.published_at).toISOString()),
+                    re2 = new RegExp('<meta property="article:modified_time" content="' + new Date(renderObject.post.updated_at).toISOString()),
+                    re3 = new RegExp('"datePublished": "' + new Date(renderObject.post.published_at).toISOString()),
+                    re4 = new RegExp('"dateModified": "' + new Date(renderObject.post.updated_at).toISOString());
 
                 should.exist(rendered);
                 rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
@@ -596,7 +542,7 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/"@type": "Person"/);
                 rendered.string.should.match(/"name": "Author name"/);
                 rendered.string.should.match(/"image\": \"http:\/\/localhost:65530\/content\/images\/test-author-image.png\"/);
-                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/Author\/"/);
+                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/author2\/"/);
                 rendered.string.should.match(/"sameAs": \[\n            "http:\/\/authorwebsite.com",\n            "https:\/\/www.facebook.com\/testuser",\n            "https:\/\/twitter.com\/testuser"\n        \]/);
                 rendered.string.should.not.match(/"description": "Author bio"/);
                 rendered.string.should.match(/"headline": "Welcome to Ghost"/);
@@ -618,31 +564,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('returns structured data on post page with custom excerpt for description and meta description', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'blog description',
-                    custom_excerpt: 'post custom excerpt',
-                    title: 'Welcome to Ghost',
-                    feature_image: '/content/images/test-image.png',
-                    og_image: '/content/images/test-facebook-image.png',
-                    og_title: '',
-                    og_description: '',
-                    twitter_image: '/content/images/test-twitter-image.png',
-                    twitter_title: 'Custom Twitter title',
-                    twitter_description: '',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    tags: [{name: 'tag1'}, {name: 'tag2'}, {name: 'tag3'}],
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http://testauthorurl.com',
-                        slug: 'Author',
-                        profile_image: '/content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        bio: 'Author bio',
-                        facebook: 'testuser',
-                        twitter: '@testuser'
-                    }
-                }
+                post: posts[3]
             }, postBk = _.cloneDeep(renderObject.post);
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -653,11 +575,6 @@ describe('{{ghost_head}} helper', function () {
                     safeVersion: '0.3'
                 }
             })).then(function (rendered) {
-                var re1 = new RegExp('<meta property="article:published_time" content="' + renderObject.post.published_at),
-                    re2 = new RegExp('<meta property="article:modified_time" content="' + renderObject.post.updated_at),
-                    re3 = new RegExp('"datePublished": "' + renderObject.post.published_at),
-                    re4 = new RegExp('"dateModified": "' + renderObject.post.updated_at);
-
                 should.exist(rendered);
                 rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
                 rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/post\/" \/>/);
@@ -669,8 +586,6 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/<meta property="og:description" content="post custom excerpt" \/>/);
                 rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/post\/" \/>/);
                 rendered.string.should.match(/<meta property="og:image" content="http:\/\/localhost:65530\/content\/images\/test-facebook-image.png" \/>/);
-                rendered.string.should.match(re1);
-                rendered.string.should.match(re2);
                 rendered.string.should.match(/<meta property="article:tag" content="tag1" \/>/);
                 rendered.string.should.match(/<meta property="article:tag" content="tag2" \/>/);
                 rendered.string.should.match(/<meta property="article:tag" content="tag3" \/>/);
@@ -689,13 +604,11 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/"@type": "Person"/);
                 rendered.string.should.match(/"name": "Author name"/);
                 rendered.string.should.match(/"image\": \"http:\/\/localhost:65530\/content\/images\/test-author-image.png\"/);
-                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/Author\/"/);
+                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/author3\/"/);
                 rendered.string.should.match(/"sameAs": \[\n            "http:\/\/authorwebsite.com",\n            "https:\/\/www.facebook.com\/testuser",\n            "https:\/\/twitter.com\/testuser"\n        \]/);
                 rendered.string.should.not.match(/"description": "Author bio"/);
                 rendered.string.should.match(/"headline": "Welcome to Ghost"/);
                 rendered.string.should.match(/"url": "http:\/\/localhost:65530\/post\/"/);
-                rendered.string.should.match(re3);
-                rendered.string.should.match(re4);
                 rendered.string.should.match(/"image": "http:\/\/localhost:65530\/content\/images\/test-image.png"/);
                 rendered.string.should.match(/"keywords": "tag1, tag2, tag3"/);
                 rendered.string.should.match(/"description": "post custom excerpt"/);
@@ -711,17 +624,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('returns structured data on post page with fall back excerpt if no meta description provided', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: '',
-                    custom_excerpt: '',
-                    title: 'Welcome to Ghost',
-                    html: '<p>This is a short post</p>',
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http://testauthorurl.com',
-                        slug: 'Author'
-                    }
-                }
+                post: posts[4]
             }, postBk = _.cloneDeep(renderObject.post);
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -753,7 +656,7 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/"author": {/);
                 rendered.string.should.match(/"@type": "Person"/);
                 rendered.string.should.match(/"name": "Author name"/);
-                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/Author\/"/);
+                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/author4\/"/);
                 rendered.string.should.not.match(/"description": "Author bio"/);
                 rendered.string.should.match(/"headline": "Welcome to Ghost"/);
                 rendered.string.should.match(/"url": "http:\/\/localhost:65530\/post\/"/);
@@ -770,30 +673,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('returns structured data on AMP post page with author image and post cover image', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'blog description',
-                    title: 'Welcome to Ghost',
-                    feature_image: '/content/images/test-image.png',
-                    og_image: '/content/images/test-facebook-image.png',
-                    og_title: 'Custom Facebook title',
-                    og_description: '',
-                    twitter_image: '/content/images/test-twitter-image.png',
-                    twitter_title: 'Custom Twitter title',
-                    twitter_description: '',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    tags: [{name: 'tag1'}, {name: 'tag2'}, {name: 'tag3'}],
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http://testauthorurl.com',
-                        slug: 'Author',
-                        profile_image: '/content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        bio: 'Author bio',
-                        facebook: 'testuser',
-                        twitter: '@testuser'
-                    }
-                }
+                post: posts[5]
             }, postBk = _.cloneDeep(renderObject.post);
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -804,11 +684,6 @@ describe('{{ghost_head}} helper', function () {
                     safeVersion: '0.3'
                 }
             })).then(function (rendered) {
-                var re1 = new RegExp('<meta property="article:published_time" content="' + renderObject.post.published_at),
-                    re2 = new RegExp('<meta property="article:modified_time" content="' + renderObject.post.updated_at),
-                    re3 = new RegExp('"datePublished": "' + renderObject.post.published_at),
-                    re4 = new RegExp('"dateModified": "' + renderObject.post.updated_at);
-
                 should.exist(rendered);
                 rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
                 rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/post\/" \/>/);
@@ -820,8 +695,6 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/<meta property="og:description" content="blog description" \/>/);
                 rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/post\/" \/>/);
                 rendered.string.should.match(/<meta property="og:image" content="http:\/\/localhost:65530\/content\/images\/test-facebook-image.png" \/>/);
-                rendered.string.should.match(re1);
-                rendered.string.should.match(re2);
                 rendered.string.should.match(/<meta property="article:tag" content="tag1" \/>/);
                 rendered.string.should.match(/<meta property="article:tag" content="tag2" \/>/);
                 rendered.string.should.match(/<meta property="article:tag" content="tag3" \/>/);
@@ -840,13 +713,11 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/"@type": "Person"/);
                 rendered.string.should.match(/"name": "Author name"/);
                 rendered.string.should.match(/"image\": \"http:\/\/localhost:65530\/content\/images\/test-author-image.png\"/);
-                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/Author\/"/);
+                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/author5\/"/);
                 rendered.string.should.match(/"sameAs": \[\n            "http:\/\/authorwebsite.com",\n            "https:\/\/www.facebook.com\/testuser",\n            "https:\/\/twitter.com\/testuser"\n        \]/);
                 rendered.string.should.not.match(/"description": "Author bio"/);
                 rendered.string.should.match(/"headline": "Welcome to Ghost"/);
                 rendered.string.should.match(/"url": "http:\/\/localhost:65530\/post\/"/);
-                rendered.string.should.match(re3);
-                rendered.string.should.match(re4);
                 rendered.string.should.match(/"image": "http:\/\/localhost:65530\/content\/images\/test-image.png"/);
                 rendered.string.should.match(/"keywords": "tag1, tag2, tag3"/);
                 rendered.string.should.match(/"description": "blog description"/);
@@ -862,24 +733,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('returns structured data if metaTitle and metaDescription have double quotes', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'blog "test" description',
-                    title: 'title',
-                    meta_title: 'Welcome to Ghost "test"',
-                    feature_image: '/content/images/test-image.png',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    tags: [{name: 'tag1'}, {name: 'tag2'}, {name: 'tag3'}],
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http//:testauthorurl.com',
-                        slug: 'Author',
-                        profile_image: '/content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        facebook: 'testuser',
-                        twitter: '@testuser'
-                    }
-                }
+                post: posts[6]
             };
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -890,11 +744,6 @@ describe('{{ghost_head}} helper', function () {
                     safeVersion: '0.3'
                 }
             })).then(function (rendered) {
-                var re1 = new RegExp('<meta property="article:published_time" content="' + renderObject.post.published_at),
-                    re2 = new RegExp('<meta property="article:modified_time" content="' + renderObject.post.updated_at),
-                    re3 = new RegExp('"datePublished": "' + renderObject.post.published_at),
-                    re4 = new RegExp('"dateModified": "' + renderObject.post.updated_at);
-
                 should.exist(rendered);
                 rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
                 rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/post\/" \/>/);
@@ -907,8 +756,6 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/post\/" \/>/);
                 rendered.string.should.match(/<meta property="og:image" content="http:\/\/localhost:65530\/content\/images\/test-image.png" \/>/);
                 rendered.string.should.match(/<meta property="article:author" content="https:\/\/www.facebook.com\/testuser" \/>/);
-                rendered.string.should.match(re1);
-                rendered.string.should.match(re2);
                 rendered.string.should.match(/<meta property="article:tag" content="tag1" \/>/);
                 rendered.string.should.match(/<meta property="article:tag" content="tag2" \/>/);
                 rendered.string.should.match(/<meta property="article:tag" content="tag3" \/>/);
@@ -928,13 +775,11 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/"@type": "Person"/);
                 rendered.string.should.match(/"name": "Author name"/);
                 rendered.string.should.match(/"image\": \"http:\/\/localhost:65530\/content\/images\/test-author-image.png\"/);
-                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/Author\/"/);
+                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/author6\/"/);
                 rendered.string.should.match(/"sameAs": \[\n            "http:\/\/authorwebsite.com",\n            "https:\/\/www.facebook.com\/testuser",\n            "https:\/\/twitter.com\/testuser"\n        \]/);
                 rendered.string.should.match(/"headline": "Welcome to Ghost &quot;test&quot;"/);
                 rendered.string.should.match(/"url": "http:\/\/localhost:65530\/post\/"/);
                 rendered.string.should.match(/"@context": "https:\/\/schema.org"/);
-                rendered.string.should.match(re3);
-                rendered.string.should.match(re4);
                 rendered.string.should.match(/"image": "http:\/\/localhost:65530\/content\/images\/test-image.png"/);
                 rendered.string.should.match(/"keywords": "tag1, tag2, tag3"/);
                 rendered.string.should.match(/"description": "blog &quot;test&quot; description"/);
@@ -948,23 +793,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('returns structured data without tags if there are no tags', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'blog description',
-                    title: 'Welcome to Ghost',
-                    feature_image: '/content/images/test-image.png',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    tags: [],
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http//:testauthorurl.com',
-                        slug: 'Author',
-                        profile_image: '/content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        facebook: 'testuser',
-                        twitter: '@testuser'
-                    }
-                }
+                post: posts[7]
             };
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -975,11 +804,6 @@ describe('{{ghost_head}} helper', function () {
                     safeVersion: '0.3'
                 }
             })).then(function (rendered) {
-                var re1 = new RegExp('<meta property="article:published_time" content="' + renderObject.post.published_at),
-                    re2 = new RegExp('<meta property="article:modified_time" content="' + renderObject.post.updated_at),
-                    re3 = new RegExp('"datePublished": "' + renderObject.post.published_at),
-                    re4 = new RegExp('"dateModified": "' + renderObject.post.updated_at);
-
                 should.exist(rendered);
                 rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
                 rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/post\/" \/>/);
@@ -992,8 +816,6 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/post\/" \/>/);
                 rendered.string.should.match(/<meta property="og:image" content="http:\/\/localhost:65530\/content\/images\/test-image.png" \/>/);
                 rendered.string.should.match(/<meta property="article:author" content="https:\/\/www.facebook.com\/testuser" \/>/);
-                rendered.string.should.match(re1);
-                rendered.string.should.match(re2);
                 rendered.string.should.not.match(/<meta property="article:tag"/);
                 rendered.string.should.match(/<meta name="twitter:card" content="summary_large_image" \/>/);
                 rendered.string.should.match(/<meta name="twitter:title" content="Welcome to Ghost" \/>/);
@@ -1010,13 +832,11 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/"@type": "Person"/);
                 rendered.string.should.match(/"name": "Author name"/);
                 rendered.string.should.match(/"image\": \"http:\/\/localhost:65530\/content\/images\/test-author-image.png\"/);
-                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/Author\/"/);
+                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/author7\/"/);
                 rendered.string.should.match(/"sameAs": \[\n            "http:\/\/authorwebsite.com",\n            "https:\/\/www.facebook.com\/testuser",\n            "https:\/\/twitter.com\/testuser"\n        \]/);
                 rendered.string.should.match(/"headline": "Welcome to Ghost"/);
                 rendered.string.should.match(/"url": "http:\/\/localhost:65530\/post\/"/);
                 rendered.string.should.match(/"@context": "https:\/\/schema.org"/);
-                rendered.string.should.match(re3);
-                rendered.string.should.match(re4);
                 rendered.string.should.match(/"image": "http:\/\/localhost:65530\/content\/images\/test-image.png"/);
                 rendered.string.should.not.match(/"keywords":/);
                 rendered.string.should.match(/"description": "blog description"/);
@@ -1030,23 +850,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('returns structured data on post page with null author image and post cover image', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'blog description',
-                    title: 'Welcome to Ghost',
-                    feature_image: null,
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    tags: [{name: 'tag1'}, {name: 'tag2'}, {name: 'tag3'}],
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http//:testauthorurl.com',
-                        slug: 'Author',
-                        profile_image: null,
-                        website: 'http://authorwebsite.com',
-                        facebook: 'testuser',
-                        twitter: '@testuser'
-                    }
-                }
+                post: posts[8]
             };
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -1057,11 +861,6 @@ describe('{{ghost_head}} helper', function () {
                     safeVersion: '0.3'
                 }
             })).then(function (rendered) {
-                var re1 = new RegExp('<meta property="article:published_time" content="' + renderObject.post.published_at),
-                    re2 = new RegExp('<meta property="article:modified_time" content="' + renderObject.post.updated_at),
-                    re3 = new RegExp('"datePublished": "' + renderObject.post.published_at),
-                    re4 = new RegExp('"dateModified": "' + renderObject.post.updated_at);
-
                 should.exist(rendered);
                 rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
                 rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/post\/" \/>/);
@@ -1074,8 +873,6 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/post\/" \/>/);
                 rendered.string.should.match(/<meta property="article:author" content="https:\/\/www.facebook.com\/testuser" \/>/);
                 rendered.string.should.not.match(/<meta property="og:image"/);
-                rendered.string.should.match(re1);
-                rendered.string.should.match(re2);
                 rendered.string.should.match(/<meta property="article:tag" content="tag1" \/>/);
                 rendered.string.should.match(/<meta property="article:tag" content="tag2" \/>/);
                 rendered.string.should.match(/<meta property="article:tag" content="tag3" \/>/);
@@ -1095,12 +892,10 @@ describe('{{ghost_head}} helper', function () {
                 rendered.string.should.match(/"@type": "Person"/);
                 rendered.string.should.match(/"name": "Author name"/);
                 rendered.string.should.not.match(/"image\"/);
-                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/Author\/"/);
+                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/author8\/"/);
                 rendered.string.should.match(/"sameAs": \[\n            "http:\/\/authorwebsite.com",\n            "https:\/\/www.facebook.com\/testuser",\n            "https:\/\/twitter.com\/testuser"\n        \]/);
                 rendered.string.should.match(/"headline": "Welcome to Ghost"/);
                 rendered.string.should.match(/"url": "http:\/\/localhost:65530\/post\/"/);
-                rendered.string.should.match(re3);
-                rendered.string.should.match(re4);
                 rendered.string.should.match(/"keywords": "tag1, tag2, tag3"/);
                 rendered.string.should.match(/"description": "blog description"/);
                 rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
@@ -1110,40 +905,9 @@ describe('{{ghost_head}} helper', function () {
             }).catch(done);
         });
 
-        it('outputs structured data but not schema for custom channel', function (done) {
-            helpers.ghost_head(testUtils.createHbsResponse({
-                locals: {
-                    relativeUrl: '/featured/',
-                    context: ['featured'],
-                    safeVersion: '0.3'
-                }
-            })).then(function (rendered) {
-                should.exist(rendered);
-                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
-                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/featured\/" \/>/);
-                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
-                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
-                rendered.string.should.match(/<meta property="og:site_name" content="Ghost" \/>/);
-                rendered.string.should.match(/<meta property="og:type" content="website" \/>/);
-                rendered.string.should.match(/<meta property="og:title" content="Ghost" \/>/);
-                rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/featured\/" \/>/);
-
-                rendered.string.should.not.match(/<script type=\"application\/ld\+json\">/);
-                rendered.string.should.not.match(/<meta name="description" /);
-
-                done();
-            }).catch(done);
-        });
-
         it('returns twitter and facebook descriptions even if no meta description available', function (done) {
             var renderObject = {
-                post: {
-                    title: 'Welcome to Ghost',
-                    html: '<p>This is a short post</p>',
-                    primary_author: {
-                        name: 'Author name'
-                    }
-                }
+                post: posts[9]
             };
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -1167,13 +931,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('returns canonical URL', function (done) {
             var renderObject = {
-                post: {
-                    title: 'Welcome to Ghost',
-                    html: '<p>This is a short post</p>',
-                    primary_author: {
-                        name: 'Author name'
-                    }
-                }
+                post: posts[9]
             };
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -1245,13 +1003,260 @@ describe('{{ghost_head}} helper', function () {
             }).catch(done);
         });
 
+        it('returns structured data and schema first tag page with meta description and meta title', function (done) {
+            var renderObject = {
+                tag: tags[0]
+            };
+
+            helpers.ghost_head(testUtils.createHbsResponse({
+                renderObject: renderObject,
+                locals: {
+                    relativeUrl: '/tag/tagtitle/',
+                    context: ['tag'],
+                    safeVersion: '0.3'
+                }
+            })).then(function (rendered) {
+                should.exist(rendered);
+                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
+                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
+                rendered.string.should.match(/<meta name="description" content="tag meta description" \/>/);
+                rendered.string.should.match(/<meta property="og:site_name" content="Ghost" \/>/);
+                rendered.string.should.match(/<meta property="og:type" content="website" \/>/);
+                rendered.string.should.match(/<meta property="og:title" content="tag meta title" \/>/);
+                rendered.string.should.match(/<meta property="og:description" content="tag meta description" \/>/);
+                rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
+                rendered.string.should.match(/<meta property="og:image" content="http:\/\/localhost:65530\/content\/images\/tag-image.png" \/>/);
+                rendered.string.should.match(/<meta name="twitter:card" content="summary_large_image" \/>/);
+                rendered.string.should.match(/<meta name="twitter:title" content="tag meta title" \/>/);
+                rendered.string.should.match(/<meta name="twitter:description" content="tag meta description" \/>/);
+                rendered.string.should.match(/<meta name="twitter:url" content="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
+                rendered.string.should.match(/<meta name="twitter:image" content="http:\/\/localhost:65530\/content\/images\/tag-image.png" \/>/);
+                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
+                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
+                rendered.string.should.match(/<script type=\"application\/ld\+json\">/);
+                rendered.string.should.match(/"@context": "https:\/\/schema.org"/);
+                rendered.string.should.match(/"@type": "Series"/);
+                rendered.string.should.match(/"publisher": {\n        "@type": "Organization",\n        "name": "Ghost",/);
+                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/tag\/tagtitle\/"/);
+                rendered.string.should.match(/"image": "http:\/\/localhost:65530\/content\/images\/tag-image.png"/);
+                rendered.string.should.match(/"name": "tagtitle"/);
+                rendered.string.should.match(/"description": "tag meta description"/);
+
+                done();
+            }).catch(done);
+        });
+
+        it('tag first page without meta data if no meta title and meta description, but model description provided', function (done) {
+            var renderObject = {
+                tag: tags[1]
+            };
+
+            helpers.ghost_head(testUtils.createHbsResponse({
+                renderObject: renderObject,
+                locals: {
+                    relativeUrl: '/tag/tagtitle/',
+                    context: ['tag'],
+                    safeVersion: '0.3'
+                }
+            })).then(function (rendered) {
+                should.exist(rendered);
+                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
+                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
+                rendered.string.should.not.match(/<meta name="description"/);
+                rendered.string.should.match(/<meta property="og:site_name" content="Ghost" \/>/);
+                rendered.string.should.match(/<meta property="og:type" content="website" \/>/);
+                rendered.string.should.match(/<meta property="og:title" content="tagtitle - Ghost" \/>/);
+                rendered.string.should.not.match(/<meta property="og:description"/);
+                rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
+                rendered.string.should.match(/<meta property="og:image" content="http:\/\/localhost:65530\/content\/images\/tag-image.png" \/>/);
+                rendered.string.should.match(/<meta name="twitter:card" content="summary_large_image" \/>/);
+                rendered.string.should.match(/<meta name="twitter:title" content="tagtitle - Ghost" \/>/);
+                rendered.string.should.not.match(/<meta name="twitter:description"/);
+                rendered.string.should.match(/<meta name="twitter:url" content="http:\/\/localhost:65530\/tag\/tagtitle\/" \/>/);
+                rendered.string.should.match(/<meta name="twitter:image" content="http:\/\/localhost:65530\/content\/images\/tag-image.png" \/>/);
+                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
+                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
+                rendered.string.should.match(/<script type=\"application\/ld\+json\">/);
+                rendered.string.should.match(/"@context": "https:\/\/schema.org"/);
+                rendered.string.should.match(/"@type": "Series"/);
+                rendered.string.should.match(/"publisher": {\n        "@type": "Organization",\n        "name": "Ghost",/);
+                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/tag\/tagtitle\/"/);
+                rendered.string.should.match(/"image": "http:\/\/localhost:65530\/content\/images\/tag-image.png"/);
+                rendered.string.should.match(/"name": "tagtitle"/);
+                rendered.string.should.not.match(/"description":/);
+
+                done();
+            }).catch(done);
+        });
+
+        it('tag first page without meta and model description returns no description fields', function (done) {
+            var renderObject = {
+                tag: tags[2]
+            };
+
+            helpers.ghost_head(testUtils.createHbsResponse({
+                renderObject: renderObject,
+                locals: {
+                    relativeUrl: '/tag/tagtitle/',
+                    context: ['tag'],
+                    safeVersion: '0.3'
+                }
+            })).then(function (rendered) {
+                should.exist(rendered);
+                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
+                rendered.string.should.not.match(/<meta name="description"/);
+                rendered.string.should.not.match(/<meta property="og:description"/);
+                rendered.string.should.not.match(/<meta name="twitter:description"/);
+                rendered.string.should.not.match(/"description":/);
+
+                done();
+            }).catch(done);
+        });
+
+        it('does not return structured data on paginated tag pages', function (done) {
+            var renderObject = {
+                tag: tags[3]
+            };
+
+            helpers.ghost_head(testUtils.createHbsResponse({
+                renderObject: renderObject,
+                locals: {
+                    relativeUrl: '/tag/tagtitle/page/2/',
+                    context: ['paged', 'tag'],
+                    safeVersion: '0.3'
+                }
+            })).then(function (rendered) {
+                should.exist(rendered);
+                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
+                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/tag\/tagtitle\/page\/2\/" \/>/);
+                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
+                rendered.string.should.not.match(/<meta name="description" content="tag meta description" \/>/);
+                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
+                rendered.string.should.not.match(/<meta property="og/);
+                rendered.string.should.not.match(/<script type=\"application\/ld\+json\">/);
+
+                done();
+            }).catch(done);
+        });
+
+        it('returns structured data and schema on first author page with cover image', function (done) {
+            helpers.ghost_head(testUtils.createHbsResponse({
+                renderObject: {author: users[0]},
+                locals: {
+                    // @TODO: WHY?
+                    relativeUrl: '/author/authorname/',
+                    context: ['author'],
+                    safeVersion: '0.3'
+                }
+            })).then(function (rendered) {
+                should.exist(rendered);
+                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
+                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/author\/authorname\/" \/>/);
+                rendered.string.should.not.match(/<meta name="description"/);
+                rendered.string.should.match(/<meta property="og:site_name" content="Ghost" \/>/);
+                rendered.string.should.match(/<meta property="og:type" content="profile" \/>/);
+                rendered.string.should.not.match(/<meta property="og:description"/);
+                rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/author\/authorname\/" \/>/);
+                rendered.string.should.match(/<meta property="og:image" content="http:\/\/localhost:65530\/content\/images\/author-cover-image.png" \/>/);
+                rendered.string.should.match(/<meta property="article:author" content="https:\/\/www.facebook.com\/testuser\" \/>/);
+                rendered.string.should.match(/<meta name="twitter:card" content="summary_large_image" \/>/);
+                rendered.string.should.match(/<meta name="twitter:title" content="Author name - Ghost" \/>/);
+                rendered.string.should.not.match(/<meta name="twitter:description"/);
+                rendered.string.should.match(/<meta name="twitter:url" content="http:\/\/localhost:65530\/author\/authorname\/" \/>/);
+                rendered.string.should.match(/<meta name="twitter:creator" content="@testuser" \/>/);
+                rendered.string.should.match(/<meta name="twitter:image" content="http:\/\/localhost:65530\/content\/images\/author-cover-image.png" \/>/);
+                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
+                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
+                rendered.string.should.match(/<script type=\"application\/ld\+json\">/);
+                rendered.string.should.match(/"@context": "https:\/\/schema.org"/);
+                rendered.string.should.match(/"@type": "Person"/);
+                rendered.string.should.match(/"sameAs": \[\n        "http:\/\/authorwebsite.com",\n        "https:\/\/www.facebook.com\/testuser",\n        "https:\/\/twitter.com\/testuser"\n    \]/);
+                rendered.string.should.match(/"url": "http:\/\/localhost:65530\/author\/authorname\/"/);
+                rendered.string.should.match(/"image": "http:\/\/localhost:65530\/content\/images\/author-cover-image.png"/);
+                rendered.string.should.match(/"name": "Author name"/);
+                rendered.string.should.not.match(/"description":/);
+
+                done();
+            }).catch(done);
+        });
+
+        it('does not return structured data on paginated author pages', function (done) {
+            helpers.ghost_head(testUtils.createHbsResponse({
+                renderObject: {author: users[1]},
+                locals: {
+                    // @TODO: WHY?
+                    relativeUrl: '/author/authorname1/page/2/',
+                    context: ['paged', 'author'],
+                    safeVersion: '0.3'
+                }
+            })).then(function (rendered) {
+                should.exist(rendered);
+                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
+                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/author\/authorname1\/page\/2\/" \/>/);
+                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
+                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
+                rendered.string.should.not.match(/<meta name="description" /);
+                rendered.string.should.not.match(/<meta property="og/);
+                rendered.string.should.not.match(/<script type=\"application\/ld\+json\">/);
+
+                done();
+            }).catch(done);
+        });
+
+        it('returns meta tag string even if safeVersion is invalid', function (done) {
+            helpers.ghost_head(testUtils.createHbsResponse({
+                locals: {
+                    context: [],
+                    safeVersion: '0.9'
+                }
+            })).then(function (rendered) {
+                should.exist(rendered);
+                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
+                rendered.string.should.match(/<meta name="generator" content="Ghost 0.9" \/>/);
+                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
+
+                done();
+            }).catch(done);
+        });
+
+        it('outputs structured data but not schema for custom collection', function (done) {
+            helpers.ghost_head(testUtils.createHbsResponse({
+                locals: {
+                    relativeUrl: '/featured/',
+                    context: ['featured'],
+                    safeVersion: '0.3'
+                }
+            })).then(function (rendered) {
+                should.exist(rendered);
+                rendered.string.should.match(/<link rel="shortcut icon" href="\/favicon.ico" type="image\/x-icon" \/>/);
+                rendered.string.should.match(/<link rel="canonical" href="http:\/\/localhost:65530\/featured\/" \/>/);
+                rendered.string.should.match(/<meta name="generator" content="Ghost 0.3" \/>/);
+                rendered.string.should.match(/<link rel="alternate" type="application\/rss\+xml" title="Ghost" href="http:\/\/localhost:65530\/rss\/" \/>/);
+                rendered.string.should.match(/<meta property="og:site_name" content="Ghost" \/>/);
+                rendered.string.should.match(/<meta property="og:type" content="website" \/>/);
+                rendered.string.should.match(/<meta property="og:title" content="Ghost" \/>/);
+                rendered.string.should.match(/<meta property="og:url" content="http:\/\/localhost:65530\/featured\/" \/>/);
+
+                rendered.string.should.not.match(/<script type=\"application\/ld\+json\">/);
+                rendered.string.should.not.match(/<meta name="description" /);
+
+                done();
+            }).catch(done);
+        });
+
         describe('with /blog subdirectory', function () {
-            beforeEach(function () {
-                localSettingsCache.icon = '/content/images/favicon.png';
+            before(function () {
+                settingsCache.get.withArgs('icon').returns('/content/images/favicon.png');
 
                 configUtils.set({
                     url: 'http://localhost:65530/blog/'
                 });
+
+                firstCollection.getRssUrl.returns('http://localhost:65530/blog/rss/');
+            });
+
+            after(function () {
+                firstCollection.getRssUrl.returns('http://localhost:65530/rss/');
             });
 
             it('returns correct rss url with subdirectory', function (done) {
@@ -1275,18 +1280,8 @@ describe('{{ghost_head}} helper', function () {
     });
 
     describe('with changed origin in config file', function () {
-        var localSettingsCache = {
-            title: 'Ghost',
-            description: 'blog description',
-            cover_image: '/content/images/blog-cover.png',
-            amp: true,
-            icon: '/content/images/favicon.png'
-        };
-
-        beforeEach(function () {
-            sandbox.stub(settingsCache, 'get').callsFake(function (key) {
-                return localSettingsCache[key];
-            });
+        before(function () {
+            settingsCache.get.withArgs('icon').returns('/content/images/favicon.png');
 
             configUtils.set({
                 url: 'http://localhost:65530/blog/',
@@ -1312,18 +1307,8 @@ describe('{{ghost_head}} helper', function () {
     });
 
     describe('with useStructuredData is set to false in config file', function () {
-        var localSettingsCache = {
-            title: 'Ghost',
-            description: 'blog description',
-            cover_image: '/content/images/blog-cover.png',
-            amp: true,
-            icon: '/content/images/favicon.png'
-        };
-
-        beforeEach(function () {
-            sandbox.stub(settingsCache, 'get').callsFake(function (key) {
-                return localSettingsCache[key];
-            });
+        before(function () {
+            settingsCache.get.withArgs('icon').returns('/content/images/favicon.png');
 
             configUtils.set({
                 url: 'http://localhost:65530/',
@@ -1335,23 +1320,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('does not return structured data', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'blog description',
-                    title: 'Welcome to Ghost',
-                    image: 'content/images/test-image.png',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    tags: [{name: 'tag1'}, {name: 'tag2'}, {name: 'tag3'}],
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http//:testauthorurl.com',
-                        slug: 'Author',
-                        image: 'content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        facebook: 'testuser',
-                        twitter: '@testuser'
-                    }
-                }
+                post: posts[2]
             };
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -1378,18 +1347,9 @@ describe('{{ghost_head}} helper', function () {
     });
 
     describe('with Code Injection', function () {
-        var localSettingsCache = {
-            title: 'Ghost',
-            description: 'blog description',
-            cover_image: '/content/images/blog-cover.png',
-            icon: '/content/images/favicon.png',
-            ghost_head: '<style>body {background: red;}</style>'
-        };
-
-        beforeEach(function () {
-            sandbox.stub(settingsCache, 'get').callsFake(function (key) {
-                return localSettingsCache[key];
-            });
+        before(function () {
+            settingsCache.get.withArgs('icon').returns('/content/images/favicon.png');
+            settingsCache.get.withArgs('ghost_head').returns('<style>body {background: red;}</style>');
 
             configUtils.set({
                 url: 'http://localhost:65530/'
@@ -1482,23 +1442,7 @@ describe('{{ghost_head}} helper', function () {
 
         it('returns meta tag without injected code for amp context', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'blog description',
-                    title: 'Welcome to Ghost',
-                    image: 'content/images/test-image.png',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    tags: [{name: 'tag1'}, {name: 'tag2'}, {name: 'tag3'}],
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http//:testauthorurl.com',
-                        slug: 'Author',
-                        image: 'content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        facebook: 'testuser',
-                        twitter: '@testuser'
-                    }
-                }
+                post: posts[1]
             };
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -1567,25 +1511,10 @@ describe('{{ghost_head}} helper', function () {
                 done();
             });
         });
+
         it('does not render script tag with for amp context', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'blog description',
-                    title: 'Welcome to Ghost',
-                    image: 'content/images/test-image.png',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    tags: [{name: 'tag1'}, {name: 'tag2'}, {name: 'tag3'}],
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http//:testauthorurl.com',
-                        slug: 'Author',
-                        image: 'content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        facebook: 'testuser',
-                        twitter: '@testuser'
-                    }
-                }
+                post: posts[1]
             };
 
             helpers.ghost_head(testUtils.createHbsResponse({
@@ -1609,40 +1538,19 @@ describe('{{ghost_head}} helper', function () {
     });
 
     describe('amp is disabled', function () {
-        var localSettingsCache = {
-            amp: false
-        };
-
-        beforeEach(function () {
+        before(function () {
             configUtils.set({
                 url: 'http://localhost:65530/'
             });
 
-            sandbox.stub(settingsCache, 'get').callsFake(function (key) {
-                return localSettingsCache[key];
-            });
+            settingsCache.get.withArgs('amp').returns(false);
         });
 
         it('does not contain amphtml link', function (done) {
             var renderObject = {
-                post: {
-                    meta_description: 'blog description',
-                    title: 'Welcome to Ghost',
-                    image: 'content/images/test-image.png',
-                    published_at: moment('2008-05-31T19:18:15').toISOString(),
-                    updated_at: moment('2014-10-06T15:23:54').toISOString(),
-                    tags: [{name: 'tag1'}, {name: 'tag2'}, {name: 'tag3'}],
-                    primary_author: {
-                        name: 'Author name',
-                        url: 'http//:testauthorurl.com',
-                        slug: 'Author',
-                        image: 'content/images/test-author-image.png',
-                        website: 'http://authorwebsite.com',
-                        facebook: 'testuser',
-                        twitter: '@testuser'
-                    }
-                }
+                post: posts[1]
             };
+
             helpers.ghost_head(testUtils.createHbsResponse({
                 renderObject: renderObject,
                 locals: {
diff --git a/core/test/integration/model/model_posts_spec.js b/core/test/integration/model/model_posts_spec.js
index c66715008b..1778030625 100644
--- a/core/test/integration/model/model_posts_spec.js
+++ b/core/test/integration/model/model_posts_spec.js
@@ -6,6 +6,7 @@ var should = require('should'),
     Promise = require('bluebird'),
     sequence = require('../../../server/lib/promise/sequence'),
     settingsCache = require('../../../server/services/settings/cache'),
+    urlService = require('../../../server/services/url'),
     ghostBookshelf = require('../../../server/models/base'),
     models = require('../../../server/models'),
     common = require('../../../server/lib/common'),
@@ -34,6 +35,10 @@ describe('Post Model', function () {
         sandbox.restore();
     });
 
+    beforeEach(function () {
+        sandbox.stub(urlService, 'getUrlByResourceId').withArgs(testUtils.DataGenerator.Content.posts[0].id).returns('/html-ipsum/');
+    });
+
     function checkFirstPostData(firstPost, options) {
         options = options || {};
 
@@ -419,6 +424,8 @@ describe('Post Model', function () {
                         }[key];
                     });
 
+                    urlService.getUrlByResourceId.withArgs(testUtils.DataGenerator.Content.posts[0].id).returns('/2015/01/01/html-ipsum/');
+
                     models.Post.findOne({id: testUtils.DataGenerator.Content.posts[0].id})
                         .then(function (result) {
                             should.exist(result);
@@ -1785,14 +1792,14 @@ describe('Post Model', function () {
 
             var post = _.cloneDeep(testUtils.DataGenerator.forModel.posts[0]),
                 postTags = [
-                    createTag({name: 'tag1'}),
-                    createTag({name: 'tag2'}),
-                    createTag({name: 'tag3'})
+                    createTag({name: 'tag1', slug: 'tag1'}),
+                    createTag({name: 'tag2', slug: 'tag2'}),
+                    createTag({name: 'tag3', slug: 'tag3'})
                 ],
                 extraTags = [
-                    createTag({name: 'existing tag a'}),
-                    createTag({name: 'existing-tag-b'}),
-                    createTag({name: 'existing_tag_c'})
+                    createTag({name: 'existing tag a', slug: 'existing-tag-a'}),
+                    createTag({name: 'existing-tag-b', slug: 'existing-tag-b'}),
+                    createTag({name: 'existing_tag_c', slug: 'existing_tag_c'})
                 ];
 
             post.tags = postTags;
diff --git a/core/test/integration/services/url/UrlService_spec.js b/core/test/integration/services/url/UrlService_spec.js
new file mode 100644
index 0000000000..25ae73e513
--- /dev/null
+++ b/core/test/integration/services/url/UrlService_spec.js
@@ -0,0 +1,737 @@
+const _ = require('lodash');
+const Promise = require('bluebird');
+const should = require('should');
+const sinon = require('sinon');
+const rewire = require('rewire');
+const testUtils = require('../../../utils/index');
+const configUtils = require('../../../utils/configUtils');
+const models = require('../../../../server/models');
+const common = require('../../../../server/lib/common');
+const UrlService = rewire('../../../../server/services/url/UrlService');
+const sandbox = sinon.sandbox.create();
+
+describe('Unit: services/url/UrlService', function () {
+    let knexMock, urlService;
+
+    before(function () {
+        models.init();
+    });
+
+    beforeEach(function () {
+        knexMock = new testUtils.mocks.knex();
+        knexMock.mock();
+    });
+
+    afterEach(function () {
+        sandbox.restore();
+    });
+
+    afterEach(function () {
+        knexMock.unmock();
+    });
+
+    after(function () {
+        sandbox.restore();
+    });
+
+    describe('functional: default routing set', function () {
+        let router1, router2, router3, router4;
+
+        beforeEach(function (done) {
+            urlService = new UrlService();
+
+            router1 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'post collection';
+                }
+            };
+
+            router2 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'authors';
+                }
+            };
+
+            router3 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'tags';
+                }
+            };
+
+            router4 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'static pages';
+                }
+            };
+
+            router1.getFilter.returns('featured:false');
+            router1.getType.returns('posts');
+            router1.getPermalinks.returns({
+                getValue: function () {
+                    return '/:slug/';
+                }
+            });
+
+            router2.getFilter.returns(false);
+            router2.getType.returns('users');
+            router2.getPermalinks.returns({
+                getValue: function () {
+                    return '/author/:slug/';
+                }
+            });
+
+            router3.getFilter.returns(false);
+            router3.getType.returns('tags');
+            router3.getPermalinks.returns({
+                getValue: function () {
+                    return '/tag/:slug/';
+                }
+            });
+
+            router4.getFilter.returns(false);
+            router4.getType.returns('pages');
+            router4.getPermalinks.returns({
+                getValue: function () {
+                    return '/:slug/';
+                }
+            });
+
+            common.events.emit('router.created', router1);
+            common.events.emit('router.created', router2);
+            common.events.emit('router.created', router3);
+            common.events.emit('router.created', router4);
+
+            common.events.emit('db.ready');
+
+            let timeout;
+            (function retry() {
+                clearTimeout(timeout);
+
+                if (urlService.hasFinished()) {
+                    return done();
+                }
+
+                setTimeout(retry, 50);
+            })();
+        });
+
+        afterEach(function () {
+            urlService.reset();
+        });
+
+        it('check url generators', function () {
+            urlService.urlGenerators.length.should.eql(4);
+            urlService.urlGenerators[0].router.should.eql(router1);
+            urlService.urlGenerators[1].router.should.eql(router2);
+            urlService.urlGenerators[2].router.should.eql(router3);
+            urlService.urlGenerators[3].router.should.eql(router4);
+        });
+
+        it('getUrl', function () {
+            urlService.urlGenerators.forEach(function (generator) {
+                if (generator.router.getType() === 'posts') {
+                    generator.getUrls().length.should.eql(2);
+                }
+
+                if (generator.router.getType() === 'pages') {
+                    generator.getUrls().length.should.eql(1);
+                }
+
+                if (generator.router.getType() === 'tags') {
+                    generator.getUrls().length.should.eql(5);
+                }
+
+                if (generator.router.getType() === 'users') {
+                    generator.getUrls().length.should.eql(5);
+                }
+            });
+
+            let url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[0].id);
+            url.should.eql('/html-ipsum/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[1].id);
+            url.should.eql('/ghostly-kitchen-sink/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[2].id);
+            url.should.eql('/404/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[0].id);
+            url.should.eql('/tag/kitchen-sink/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[1].id);
+            url.should.eql('/tag/bacon/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[2].id);
+            url.should.eql('/tag/chorizo/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[3].id);
+            url.should.eql('/tag/pollo/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[4].id);
+            url.should.eql('/tag/injection/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[0].id);
+            url.should.eql('/author/joe-bloggs/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[1].id);
+            url.should.eql('/author/smith-wellingsworth/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[2].id);
+            url.should.eql('/author/jimothy-bogendath/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[3].id);
+            url.should.eql('/author/slimer-mcectoplasm/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[4].id);
+            url.should.eql('/author/contributor/');
+        });
+
+        it('getResource', function () {
+            let resource = urlService.getResource('/html-ipsum/');
+            resource.data.id.should.eql(testUtils.DataGenerator.forKnex.posts[0].id);
+
+            resource = urlService.getResource('/does-not-exist/');
+            should.not.exist(resource);
+        });
+
+        describe('update resource', function () {
+            it('featured: false => featured:true', function () {
+                return models.Post.edit({featured: true}, {id: testUtils.DataGenerator.forKnex.posts[1].id})
+                    .then(function (post) {
+                        // There is no collection which owns featured posts.
+                        let url = urlService.getUrlByResourceId(post.id);
+                        url.should.eql('/404/');
+
+                        urlService.urlGenerators.forEach(function (generator) {
+                            if (generator.router.getType() === 'posts') {
+                                generator.getUrls().length.should.eql(1);
+                            }
+
+                            if (generator.router.getType() === 'pages') {
+                                generator.getUrls().length.should.eql(1);
+                            }
+                        });
+                    });
+            });
+
+            it('page: false => page:true', function () {
+                return models.Post.edit({page: true}, {id: testUtils.DataGenerator.forKnex.posts[1].id})
+                    .then(function (post) {
+                        let url = urlService.getUrlByResourceId(post.id);
+
+                        url.should.eql('/ghostly-kitchen-sink/');
+
+                        urlService.urlGenerators.forEach(function (generator) {
+                            if (generator.router.getType() === 'posts') {
+                                generator.getUrls().length.should.eql(1);
+                            }
+
+                            if (generator.router.getType() === 'pages') {
+                                generator.getUrls().length.should.eql(2);
+                            }
+                        });
+                    });
+            });
+
+            it('page: true => page:false', function () {
+                return models.Post.edit({page: false}, {id: testUtils.DataGenerator.forKnex.posts[5].id})
+                    .then(function (post) {
+                        let url = urlService.getUrlByResourceId(post.id);
+
+                        url.should.eql('/static-page-test/');
+
+                        urlService.urlGenerators.forEach(function (generator) {
+                            if (generator.router.getType() === 'posts') {
+                                generator.getUrls().length.should.eql(3);
+                            }
+
+                            if (generator.router.getType() === 'pages') {
+                                generator.getUrls().length.should.eql(0);
+                            }
+                        });
+                    });
+            });
+        });
+
+        describe('add new resource', function () {
+            it('already published', function () {
+                return models.Post.add({
+                    featured: false,
+                    page: false,
+                    status: 'published',
+                    title: 'Brand New Story!',
+                    author_id: testUtils.DataGenerator.forKnex.users[4].id
+                }).then(function (post) {
+                    let url = urlService.getUrlByResourceId(post.id);
+                    url.should.eql('/brand-new-story/');
+
+                    let resource = urlService.getResource(url);
+                    resource.data.primary_author.id.should.eql(testUtils.DataGenerator.forKnex.users[4].id);
+                });
+            });
+
+            it('draft', function () {
+                return models.Post.add({
+                    featured: false,
+                    page: false,
+                    status: 'draft',
+                    title: 'Brand New Story!',
+                    author_id: testUtils.DataGenerator.forKnex.users[4].id
+                }).then(function (post) {
+                    let url = urlService.getUrlByResourceId(post.id);
+                    url.should.eql('/404/');
+
+                    let resource = urlService.getResource(url);
+                    should.not.exist(resource);
+                });
+            });
+        });
+    });
+
+    describe('functional: extended/modified routing set', function () {
+        let router1, router2, router3, router4, router5;
+
+        beforeEach(function (done) {
+            urlService = new UrlService();
+
+            router1 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'post collection 1';
+                }
+            };
+
+            router2 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'post collection 2';
+                }
+            };
+
+            router3 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'authors';
+                }
+            };
+
+            router4 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'tags';
+                }
+            };
+
+            router5 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'static pages';
+                }
+            };
+
+            router1.getFilter.returns('featured:false');
+            router1.getType.returns('posts');
+            router1.getPermalinks.returns({
+                getValue: function () {
+                    return '/collection/:year/:slug/';
+                }
+            });
+
+            router2.getFilter.returns('featured:true');
+            router2.getType.returns('posts');
+            router2.getPermalinks.returns({
+                getValue: function () {
+                    return '/podcast/:slug/';
+                }
+            });
+
+            router3.getFilter.returns(false);
+            router3.getType.returns('users');
+            router3.getPermalinks.returns({
+                getValue: function () {
+                    return '/persons/:slug/';
+                }
+            });
+
+            router4.getFilter.returns(false);
+            router4.getType.returns('tags');
+            router4.getPermalinks.returns({
+                getValue: function () {
+                    return '/category/:slug/';
+                }
+            });
+
+            router5.getFilter.returns(false);
+            router5.getType.returns('pages');
+            router5.getPermalinks.returns({
+                getValue: function () {
+                    return '/:slug/';
+                }
+            });
+
+            common.events.emit('router.created', router1);
+            common.events.emit('router.created', router2);
+            common.events.emit('router.created', router3);
+            common.events.emit('router.created', router4);
+            common.events.emit('router.created', router5);
+
+            common.events.emit('db.ready');
+
+            let timeout;
+            (function retry() {
+                clearTimeout(timeout);
+
+                if (urlService.hasFinished()) {
+                    return done();
+                }
+
+                setTimeout(retry, 50);
+            })();
+        });
+
+        afterEach(function () {
+            urlService.resetGenerators();
+        });
+
+        it('check url generators', function () {
+            urlService.urlGenerators.length.should.eql(5);
+            urlService.urlGenerators[0].router.should.eql(router1);
+            urlService.urlGenerators[1].router.should.eql(router2);
+            urlService.urlGenerators[2].router.should.eql(router3);
+            urlService.urlGenerators[3].router.should.eql(router4);
+            urlService.urlGenerators[4].router.should.eql(router5);
+        });
+
+        it('getUrl', function () {
+            urlService.urlGenerators.forEach(function (generator) {
+                if (generator.router.getType() === 'posts' && generator.router.getFilter() === 'featured:false') {
+                    generator.getUrls().length.should.eql(2);
+                }
+
+                if (generator.router.getType() === 'posts' && generator.router.getFilter() === 'featured:true') {
+                    generator.getUrls().length.should.eql(2);
+                }
+
+                if (generator.router.getType() === 'pages') {
+                    generator.getUrls().length.should.eql(1);
+                }
+
+                if (generator.router.getType() === 'tags') {
+                    generator.getUrls().length.should.eql(5);
+                }
+
+                if (generator.router.getType() === 'users') {
+                    generator.getUrls().length.should.eql(5);
+                }
+            });
+
+            let url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[0].id);
+            url.should.eql('/collection/2015/html-ipsum/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[1].id);
+            url.should.eql('/collection/2015/ghostly-kitchen-sink/');
+
+            // featured
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[2].id);
+            url.should.eql('/podcast/short-and-sweet/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[0].id);
+            url.should.eql('/category/kitchen-sink/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[1].id);
+            url.should.eql('/category/bacon/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[2].id);
+            url.should.eql('/category/chorizo/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[3].id);
+            url.should.eql('/category/pollo/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[4].id);
+            url.should.eql('/category/injection/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[0].id);
+            url.should.eql('/persons/joe-bloggs/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[1].id);
+            url.should.eql('/persons/smith-wellingsworth/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[2].id);
+            url.should.eql('/persons/jimothy-bogendath/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[3].id);
+            url.should.eql('/persons/slimer-mcectoplasm/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[4].id);
+            url.should.eql('/persons/contributor/');
+        });
+
+        describe('update resource', function () {
+            it('featured: false => featured:true', function () {
+                return models.Post.edit({featured: true}, {id: testUtils.DataGenerator.forKnex.posts[1].id})
+                    .then(function (post) {
+                        // There is no collection which owns featured posts.
+                        let url = urlService.getUrlByResourceId(post.id);
+                        url.should.eql('/podcast/ghostly-kitchen-sink/');
+
+                        urlService.urlGenerators.forEach(function (generator) {
+                            if (generator.router.getType() === 'posts' && generator.router.getFilter() === 'featured:false') {
+                                generator.getUrls().length.should.eql(1);
+                            }
+
+                            if (generator.router.getType() === 'posts' && generator.router.getFilter() === 'featured:true') {
+                                generator.getUrls().length.should.eql(3);
+                            }
+                        });
+                    });
+            });
+
+            it('featured: true => featured:false', function () {
+                return models.Post.edit({featured: false}, {id: testUtils.DataGenerator.forKnex.posts[2].id})
+                    .then(function (post) {
+                        // There is no collection which owns featured posts.
+                        let url = urlService.getUrlByResourceId(post.id);
+                        url.should.eql('/collection/2015/short-and-sweet/');
+
+                        urlService.urlGenerators.forEach(function (generator) {
+                            if (generator.router.getType() === 'posts' && generator.router.getFilter() === 'featured:false') {
+                                generator.getUrls().length.should.eql(3);
+                            }
+
+                            if (generator.router.getType() === 'posts' && generator.router.getFilter() === 'featured:true') {
+                                generator.getUrls().length.should.eql(1);
+                            }
+                        });
+                    });
+            });
+        });
+    });
+
+    describe('functional: subdirectory', function () {
+        let router1, router2, router3, router4, router5;
+
+        beforeEach(function (done) {
+            configUtils.set('url', 'http://localhost:2388/blog');
+
+            urlService = new UrlService();
+
+            router1 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'post collection 1';
+                }
+            };
+
+            router2 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'post collection 2';
+                }
+            };
+
+            router3 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'authors';
+                }
+            };
+
+            router4 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'tags';
+                }
+            };
+
+            router5 = {
+                getFilter: sandbox.stub(),
+                addListener: sandbox.stub(),
+                getType: sandbox.stub(),
+                getPermalinks: sandbox.stub(),
+                toString: function () {
+                    return 'static pages';
+                }
+            };
+
+            router1.getFilter.returns('featured:false');
+            router1.getType.returns('posts');
+            router1.getPermalinks.returns({
+                getValue: function () {
+                    return '/collection/:year/:slug/';
+                }
+            });
+
+            router2.getFilter.returns('featured:true');
+            router2.getType.returns('posts');
+            router2.getPermalinks.returns({
+                getValue: function () {
+                    return '/podcast/:slug/';
+                }
+            });
+
+            router3.getFilter.returns(false);
+            router3.getType.returns('users');
+            router3.getPermalinks.returns({
+                getValue: function () {
+                    return '/persons/:slug/';
+                }
+            });
+
+            router4.getFilter.returns(false);
+            router4.getType.returns('tags');
+            router4.getPermalinks.returns({
+                getValue: function () {
+                    return '/category/:slug/';
+                }
+            });
+
+            router5.getFilter.returns(false);
+            router5.getType.returns('pages');
+            router5.getPermalinks.returns({
+                getValue: function () {
+                    return '/:slug/';
+                }
+            });
+
+            common.events.emit('router.created', router1);
+            common.events.emit('router.created', router2);
+            common.events.emit('router.created', router3);
+            common.events.emit('router.created', router4);
+            common.events.emit('router.created', router5);
+
+            common.events.emit('db.ready');
+
+            let timeout;
+            (function retry() {
+                clearTimeout(timeout);
+
+                if (urlService.hasFinished()) {
+                    return done();
+                }
+
+                setTimeout(retry, 50);
+            })();
+        });
+
+        afterEach(function () {
+            urlService.resetGenerators();
+            configUtils.restore();
+        });
+
+        it('check url generators', function () {
+            urlService.urlGenerators.length.should.eql(5);
+            urlService.urlGenerators[0].router.should.eql(router1);
+            urlService.urlGenerators[1].router.should.eql(router2);
+            urlService.urlGenerators[2].router.should.eql(router3);
+            urlService.urlGenerators[3].router.should.eql(router4);
+            urlService.urlGenerators[4].router.should.eql(router5);
+        });
+
+        it('getUrl', function () {
+            urlService.urlGenerators.forEach(function (generator) {
+                if (generator.router.getType() === 'posts' && generator.router.getFilter() === 'featured:false') {
+                    generator.getUrls().length.should.eql(2);
+                }
+
+                if (generator.router.getType() === 'posts' && generator.router.getFilter() === 'featured:true') {
+                    generator.getUrls().length.should.eql(2);
+                }
+
+                if (generator.router.getType() === 'pages') {
+                    generator.getUrls().length.should.eql(1);
+                }
+
+                if (generator.router.getType() === 'tags') {
+                    generator.getUrls().length.should.eql(5);
+                }
+
+                if (generator.router.getType() === 'users') {
+                    generator.getUrls().length.should.eql(5);
+                }
+            });
+
+            let url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[0].id);
+            url.should.eql('/blog/collection/2015/html-ipsum/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[1].id);
+            url.should.eql('/blog/collection/2015/ghostly-kitchen-sink/');
+
+            // featured
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[2].id);
+            url.should.eql('/blog/podcast/short-and-sweet/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[0].id);
+            url.should.eql('/blog/category/kitchen-sink/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[1].id);
+            url.should.eql('/blog/category/bacon/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[2].id);
+            url.should.eql('/blog/category/chorizo/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[3].id);
+            url.should.eql('/blog/category/pollo/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[4].id);
+            url.should.eql('/blog/category/injection/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[0].id);
+            url.should.eql('/blog/persons/joe-bloggs/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[1].id);
+            url.should.eql('/blog/persons/smith-wellingsworth/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[2].id);
+            url.should.eql('/blog/persons/jimothy-bogendath/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[3].id);
+            url.should.eql('/blog/persons/slimer-mcectoplasm/');
+
+            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[4].id);
+            url.should.eql('/blog/persons/contributor/');
+        });
+    });
+});
diff --git a/core/test/integration/web/site_spec.js b/core/test/integration/web/site_spec.js
index 7836a330d2..ed3fa6330b 100644
--- a/core/test/integration/web/site_spec.js
+++ b/core/test/integration/web/site_spec.js
@@ -1,54 +1,65 @@
 const should = require('should'),
     sinon = require('sinon'),
+    cheerio = require('cheerio'),
     testUtils = require('../../utils'),
     configUtils = require('../../utils/configUtils'),
-    siteApp = require('../../../server/web/site/app'),
-    models = require('../../../server/models'),
+    api = require('../../../server/api'),
+    settingsService = require('../../../server/services/settings'),
+    themeConfig = require('../../../server/services/themes/config'),
+    siteApp = require('../../../server/web/parent-app'),
     sandbox = sinon.sandbox.create();
 
 describe('Integration - Web - Site', function () {
-    let app;
+    let app, knexMock;
 
-    beforeEach(function () {
-        app = siteApp();
+    describe('default routes.yaml', function () {
+        before(function () {
+            knexMock = new testUtils.mocks.knex();
+            knexMock.mock();
+        });
 
-        return testUtils.configureGhost(sandbox);
-    });
+        after(function () {
+            knexMock.unmock();
+        });
 
-    afterEach(function () {
-        sandbox.restore();
-        configUtils.restore();
-    });
+        before(function () {
+            sandbox.stub(themeConfig, 'create').returns({
+                posts_per_page: 2
+            });
 
-    describe('component: prettify', function () {
-        it('url without slash', function () {
-            const req = {
-                secure: false,
-                method: 'GET',
-                url: '/prettify-me',
-                host: 'example.com'
-            };
+            testUtils.integrationTesting.urlService.resetGenerators();
+            testUtils.integrationTesting.defaultMocks(sandbox);
+            testUtils.integrationTesting.overrideGhostConfig(configUtils);
 
-            return testUtils.mocks.express.invoke(app, req)
-                .then(function (response) {
-                    response.statusCode.should.eql(301);
-                    response.headers.location.should.eql('/prettify-me/');
+            return testUtils.integrationTesting.initGhost()
+                .then(function () {
+                    app = siteApp();
+
+                    return testUtils.integrationTesting.urlService.waitTillFinished();
                 });
         });
-    });
 
-    describe('component: url redirects', function () {
-        describe('page', function () {
-            it('success', function () {
-                configUtils.set('url', 'https://example.com');
+        beforeEach(function () {
+            configUtils.set('url', 'http://example.com');
 
-                sandbox.stub(models.Post, 'findOne')
-                    .resolves(models.Post.forge(testUtils.DataGenerator.forKnex.createPost({slug: 'cars'})));
+            sandbox.spy(api.posts, 'browse');
+        });
 
+        afterEach(function () {
+            api.posts.browse.restore();
+        });
+
+        after(function () {
+            configUtils.restore();
+            sandbox.restore();
+        });
+
+        describe('behaviour: default cases', function () {
+            it('serve post', function () {
                 const req = {
                     secure: true,
                     method: 'GET',
-                    url: '/cars/',
+                    url: '/html-ipsum/',
                     host: 'example.com'
                 };
 
@@ -59,43 +70,135 @@ describe('Integration - Web - Site', function () {
                     });
             });
 
-            it('blog is https, request is http', function () {
-                configUtils.set('url', 'https://example.com');
-
+            it('post not found', function () {
                 const req = {
-                    secure: false,
-                    host: 'example.com',
+                    secure: true,
                     method: 'GET',
-                    url: '/cars'
-                };
-
-                return testUtils.mocks.express.invoke(app, req)
-                    .then(function (response) {
-                        response.statusCode.should.eql(301);
-                        response.headers.location.should.eql('https://example.com/cars/');
-                    });
-            });
-
-            it('blog is https, request is http, trailing slash exists already', function () {
-                configUtils.set('url', 'https://example.com');
-
-                const req = {
-                    secure: false,
-                    method: 'GET',
-                    url: '/cars/',
+                    url: '/not-found/',
                     host: 'example.com'
                 };
 
                 return testUtils.mocks.express.invoke(app, req)
                     .then(function (response) {
-                        response.statusCode.should.eql(301);
-                        response.headers.location.should.eql('https://example.com/cars/');
+                        response.statusCode.should.eql(404);
+                        response.template.should.eql('error-404');
                     });
             });
-        });
 
-        describe('assets', function () {
-            it('success', function () {
+            it('serve static page', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/static-page-test/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('page');
+                    });
+            });
+
+            it('serve author', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/author/joe-bloggs/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        const $ = cheerio.load(response.body);
+
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('author');
+
+                        $('.author-bio').length.should.equal(1);
+                    });
+            });
+
+            it('serve tag', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/tag/bacon/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('tag');
+
+                        api.posts.browse.args[0][0].filter.should.eql('tags:\'bacon\'+tags.visibility:public');
+                        api.posts.browse.args[0][0].page.should.eql(1);
+                        api.posts.browse.args[0][0].limit.should.eql(2);
+                    });
+            });
+
+            it('serve tag rss', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/tag/bacon/rss/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                    });
+            });
+
+            it('serve collection', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        const $ = cheerio.load(response.body);
+
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('index');
+
+                        $('.post-card').length.should.equal(2);
+
+                        should.exist(response.res.locals.context);
+                        should.exist(response.res.locals.version);
+                        should.exist(response.res.locals.safeVersion);
+                        should.exist(response.res.locals.safeVersion);
+                        should.exist(response.res.locals.relativeUrl);
+                        should.exist(response.res.locals.secure);
+                        should.exist(response.res.locals.routerOptions);
+                    });
+            });
+
+            it('serve collection: page 2', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/page/2/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        const $ = cheerio.load(response.body);
+
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('index');
+
+                        $('.post-card').length.should.equal(2);
+                    });
+            });
+
+            it('serve public asset', function () {
                 const req = {
                     secure: false,
                     method: 'GET',
@@ -109,8 +212,8 @@ describe('Integration - Web - Site', function () {
                     });
             });
 
-            it('success', function () {
-                configUtils.set('url', 'https://example.com');
+            it('serve theme asset', function () {
+                //configUtils.set('url', 'https://example.com');
 
                 const req = {
                     secure: true,
@@ -124,55 +227,888 @@ describe('Integration - Web - Site', function () {
                         response.statusCode.should.eql(200);
                     });
             });
+        });
 
-            it('blog is https, request is http', function () {
-                configUtils.set('url', 'https://example.com');
-
+        describe('behaviour: prettify', function () {
+            it('url without slash', function () {
                 const req = {
                     secure: false,
                     method: 'GET',
-                    url: '/public/ghost-sdk.js',
+                    url: '/prettify-me',
                     host: 'example.com'
                 };
 
                 return testUtils.mocks.express.invoke(app, req)
                     .then(function (response) {
                         response.statusCode.should.eql(301);
-                        response.headers.location.should.eql('https://example.com/public/ghost-sdk.js');
+                        response.headers.location.should.eql('/prettify-me/');
+                    });
+            });
+        });
+
+        describe('behaviour: url redirects', function () {
+            describe('url options', function () {
+                it('should not redirect /edit/', function () {
+                    const req = {
+                        secure: false,
+                        host: 'example.com',
+                        method: 'GET',
+                        url: '/edit/'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(404);
+                        });
+                });
+
+                it('should redirect static page /edit/', function () {
+                    const req = {
+                        secure: false,
+                        host: 'example.com',
+                        method: 'GET',
+                        url: '/static-page-test/edit/'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(302);
+                        });
+                });
+
+                it('should redirect post /edit/', function () {
+                    const req = {
+                        secure: false,
+                        host: 'example.com',
+                        method: 'GET',
+                        url: '/html-ipsum/edit/'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(302);
+                        });
+                });
+            });
+
+            describe('pagination', function () {
+                it('redirect /page/1/ to /', function () {
+                    const req = {
+                        secure: false,
+                        host: 'example.com',
+                        method: 'GET',
+                        url: '/page/1/'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(301);
+                            response.headers.location.should.eql('/');
+                        });
+                });
+            });
+
+            describe('rss', function () {
+                it('redirect /feed/ to /rss/', function () {
+                    const req = {
+                        secure: false,
+                        host: 'example.com',
+                        method: 'GET',
+                        url: '/feed/'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(301);
+                            response.headers.location.should.eql('/rss/');
+                        });
+                });
+
+                it('redirect /rss/1/ to /rss/', function () {
+                    const req = {
+                        secure: false,
+                        host: 'example.com',
+                        method: 'GET',
+                        url: '/rss/1/'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(301);
+                            response.headers.location.should.eql('/rss/');
+                        });
+                });
+            });
+
+            describe('protocol', function () {
+                it('blog is https, request is http', function () {
+                    configUtils.set('url', 'https://example.com');
+
+                    const req = {
+                        secure: false,
+                        host: 'example.com',
+                        method: 'GET',
+                        url: '/html-ipsum'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(301);
+                            response.headers.location.should.eql('https://example.com/html-ipsum/');
+                        });
+                });
+
+                it('blog is https, request is http, trailing slash exists already', function () {
+                    configUtils.set('url', 'https://example.com');
+
+                    const req = {
+                        secure: false,
+                        method: 'GET',
+                        url: '/html-ipsum/',
+                        host: 'example.com'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(301);
+                            response.headers.location.should.eql('https://example.com/html-ipsum/');
+                        });
+                });
+            });
+
+            describe('assets', function () {
+                it('blog is https, request is http', function () {
+                    configUtils.set('url', 'https://example.com');
+
+                    const req = {
+                        secure: false,
+                        method: 'GET',
+                        url: '/public/ghost-sdk.js',
+                        host: 'example.com'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(301);
+                            response.headers.location.should.eql('https://example.com/public/ghost-sdk.js');
+                        });
+                });
+
+                it('blog is https, request is http', function () {
+                    configUtils.set('url', 'https://example.com');
+
+                    const req = {
+                        secure: false,
+                        method: 'GET',
+                        url: '/favicon.png',
+                        host: 'example.com'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(301);
+                            response.headers.location.should.eql('https://example.com/favicon.png');
+                        });
+                });
+
+                it('blog is https, request is http', function () {
+                    configUtils.set('url', 'https://example.com');
+
+                    const req = {
+                        secure: false,
+                        method: 'GET',
+                        url: '/assets/css/main.css',
+                        host: 'example.com'
+                    };
+
+                    return testUtils.mocks.express.invoke(app, req)
+                        .then(function (response) {
+                            response.statusCode.should.eql(301);
+                            response.headers.location.should.eql('https://example.com/assets/css/main.css');
+                        });
+                });
+            });
+        });
+    });
+
+    describe('extended routes.yaml (1): 2 collections', function () {
+        before(function () {
+            knexMock = new testUtils.mocks.knex();
+            knexMock.mock();
+        });
+
+        after(function () {
+            knexMock.unmock();
+        });
+
+        before(function () {
+            sandbox.stub(settingsService, 'get').returns({
+                routes: {
+                    '/': 'home'
+                },
+
+                collections: {
+                    '/podcast/': {
+                        permalink: '/podcast/:slug/',
+                        filter: 'featured:true'
+                    },
+
+                    '/something/': {
+                        permalink: '/something/:slug/'
+                    }
+                },
+
+                taxonomies: {
+                    tag: '/categories/:slug/',
+                    author: '/authors/:slug/'
+                }
+            });
+
+            testUtils.integrationTesting.urlService.resetGenerators();
+            testUtils.integrationTesting.defaultMocks(sandbox);
+
+            return testUtils.integrationTesting.initGhost()
+                .then(function () {
+                    app = siteApp();
+
+                    return testUtils.integrationTesting.urlService.waitTillFinished();
+                });
+        });
+
+        beforeEach(function () {
+            testUtils.integrationTesting.overrideGhostConfig(configUtils);
+        });
+
+        afterEach(function () {
+            configUtils.restore();
+        });
+
+        after(function () {
+            sandbox.restore();
+        });
+
+        describe('behaviour: default cases', function () {
+            it('serve home', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+
+                        // falls back to index, because Casper has no home.hbs
+                        response.template.should.eql('index');
                     });
             });
 
-            it('blog is https, request is http', function () {
-                configUtils.set('url', 'https://example.com');
-
+            it('serve rss', function () {
                 const req = {
-                    secure: false,
+                    secure: true,
                     method: 'GET',
-                    url: '/favicon.png',
+                    url: '/podcast/rss/',
                     host: 'example.com'
                 };
 
                 return testUtils.mocks.express.invoke(app, req)
                     .then(function (response) {
-                        response.statusCode.should.eql(301);
-                        response.headers.location.should.eql('https://example.com/favicon.png');
+                        response.statusCode.should.eql(200);
                     });
             });
 
-            it('blog is https, request is http', function () {
-                configUtils.set('url', 'https://example.com');
-
+            it('serve post', function () {
                 const req = {
-                    secure: false,
+                    secure: true,
                     method: 'GET',
-                    url: '/assets/css/main.css',
+                    url: '/something/html-ipsum/',
                     host: 'example.com'
                 };
 
                 return testUtils.mocks.express.invoke(app, req)
                     .then(function (response) {
-                        response.statusCode.should.eql(301);
-                        response.headers.location.should.eql('https://example.com/assets/css/main.css');
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('post');
+                    });
+            });
+
+            it('serve collection: podcast', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/podcast/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        const $ = cheerio.load(response.body);
+
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('index');
+
+                        $('.post-card').length.should.equal(2);
+                    });
+            });
+
+            it('serve collection: something', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/something/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        const $ = cheerio.load(response.body);
+
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('index');
+
+                        $('.post-card').length.should.equal(2);
+                    });
+            });
+        });
+    });
+
+    describe('extended routes.yaml (2): static permalink route', function () {
+        before(function () {
+            knexMock = new testUtils.mocks.knex();
+            knexMock.mock();
+        });
+
+        after(function () {
+            knexMock.unmock();
+        });
+
+        before(function () {
+            sandbox.stub(settingsService, 'get').returns({
+                routes: {},
+
+                collections: {
+                    '/podcast/': {
+                        permalink: '/featured/',
+                        filter: 'featured:true'
+                    },
+
+                    '/': {
+                        permalink: '/:slug'
+                    }
+                },
+
+                taxonomies: {}
+            });
+
+            testUtils.integrationTesting.urlService.resetGenerators();
+            testUtils.integrationTesting.defaultMocks(sandbox);
+
+            return testUtils.integrationTesting.initGhost()
+                .then(function () {
+                    app = siteApp();
+
+                    return testUtils.integrationTesting.urlService.waitTillFinished();
+                });
+        });
+
+        beforeEach(function () {
+            testUtils.integrationTesting.overrideGhostConfig(configUtils);
+        });
+
+        afterEach(function () {
+            configUtils.restore();
+        });
+
+        after(function () {
+            sandbox.restore();
+        });
+
+        describe('behaviour: default cases', function () {
+            it('serve post', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/featured/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        // We can't find a post with the slug "featured"
+                        response.statusCode.should.eql(404);
+                        response.template.should.eql('error-404');
+                    });
+            });
+
+            it('serve post', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/html-ipsum/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('post');
+                    });
+            });
+
+            it('serve author', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/author/joe-bloggs/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(404);
+                        response.template.should.eql('error-404');
+                    });
+            });
+
+            it('serve tag', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/tag/bacon/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(404);
+                        response.template.should.eql('error-404');
+                    });
+            });
+        });
+    });
+
+    describe('extended routes.yaml (3): templates', function () {
+        describe('(3) (1)', function () {
+            before(function () {
+                knexMock = new testUtils.mocks.knex();
+                knexMock.mock();
+            });
+
+            after(function () {
+                knexMock.unmock();
+            });
+
+            before(function () {
+                sandbox.stub(settingsService, 'get').returns({
+                    routes: {},
+
+                    collections: {
+                        '/': {
+                            permalink: '/:slug/',
+                            template: ['default']
+                        },
+                        '/magic/': {
+                            permalink: '/magic/:slug/'
+                        }
+                    }
+                });
+
+                testUtils.integrationTesting.urlService.resetGenerators();
+                testUtils.integrationTesting.defaultMocks(sandbox);
+
+                return testUtils.integrationTesting.initGhost()
+                    .then(function () {
+                        app = siteApp();
+
+                        return testUtils.integrationTesting.urlService.waitTillFinished();
+                    });
+            });
+
+            beforeEach(function () {
+                testUtils.integrationTesting.overrideGhostConfig(configUtils);
+            });
+
+            afterEach(function () {
+                configUtils.restore();
+            });
+
+            after(function () {
+                sandbox.restore();
+            });
+
+            it('serve collection', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('default');
+                    });
+            });
+
+            it('serve second collectiom', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/magic/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('index');
+                    });
+            });
+        });
+
+        describe('(3) (2)', function () {
+            before(function () {
+                knexMock = new testUtils.mocks.knex();
+                knexMock.mock();
+            });
+
+            after(function () {
+                knexMock.unmock();
+            });
+
+            before(function () {
+                sandbox.stub(settingsService, 'get').returns({
+                    routes: {},
+
+                    collections: {
+                        '/': {
+                            permalink: '/:slug/',
+                            template: ['something', 'default']
+                        }
+                    }
+                });
+
+                testUtils.integrationTesting.urlService.resetGenerators();
+                testUtils.integrationTesting.defaultMocks(sandbox);
+
+                return testUtils.integrationTesting.initGhost()
+                    .then(function () {
+                        app = siteApp();
+
+                        return testUtils.integrationTesting.urlService.waitTillFinished();
+                    });
+            });
+
+            beforeEach(function () {
+                testUtils.integrationTesting.overrideGhostConfig(configUtils);
+            });
+
+            afterEach(function () {
+                configUtils.restore();
+            });
+
+            after(function () {
+                sandbox.restore();
+            });
+
+            it('serve collection', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('default');
+                    });
+            });
+        });
+
+        describe('(3) (3)', function () {
+            before(function () {
+                knexMock = new testUtils.mocks.knex();
+                knexMock.mock();
+            });
+
+            after(function () {
+                knexMock.unmock();
+            });
+
+            before(function () {
+                sandbox.stub(settingsService, 'get').returns({
+                    routes: {},
+
+                    collections: {
+                        '/': {
+                            permalink: '/:slug/',
+                            template: ['something', 'default']
+                        },
+                        '/magic/': {
+                            permalink: '/magic/:slug/',
+                            template: ['something', 'default']
+                        }
+                    }
+                });
+
+                testUtils.integrationTesting.urlService.resetGenerators();
+                testUtils.integrationTesting.defaultMocks(sandbox, {theme: 'test-theme'});
+
+                return testUtils.integrationTesting.initGhost()
+                    .then(function () {
+                        app = siteApp();
+
+                        return testUtils.integrationTesting.urlService.waitTillFinished();
+                    });
+            });
+
+            beforeEach(function () {
+                testUtils.integrationTesting.overrideGhostConfig(configUtils);
+            });
+
+            afterEach(function () {
+                configUtils.restore();
+            });
+
+            after(function () {
+                sandbox.restore();
+            });
+
+            it('serve collection', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('home');
+                    });
+            });
+
+            it('serve second page collection: should use index.hbs', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/magic/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('something');
+                    });
+            });
+        });
+    });
+
+    describe('extended routes.yaml (4): primary author permalink', function () {
+        before(function () {
+            knexMock = new testUtils.mocks.knex();
+            knexMock.mock();
+        });
+
+        after(function () {
+            knexMock.unmock();
+        });
+
+        before(function () {
+            sandbox.stub(settingsService, 'get').returns({
+                routes: {},
+
+                collections: {
+                    '/something/': {
+                        permalink: '/:primary_author/:slug/'
+                    }
+                },
+
+                taxonomies: {}
+            });
+
+            testUtils.integrationTesting.urlService.resetGenerators();
+            testUtils.integrationTesting.defaultMocks(sandbox);
+
+            return testUtils.integrationTesting.initGhost()
+                .then(function () {
+                    app = siteApp();
+
+                    return testUtils.integrationTesting.urlService.waitTillFinished();
+                });
+        });
+
+        beforeEach(function () {
+            testUtils.integrationTesting.overrideGhostConfig(configUtils);
+        });
+
+        afterEach(function () {
+            configUtils.restore();
+        });
+
+        after(function () {
+            sandbox.restore();
+        });
+
+        describe('behaviour: default cases', function () {
+            it('serve post', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/joe-bloggs/html-ipsum/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('post');
+                    });
+            });
+
+            it('post without author', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/html-ipsum/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(404);
+                        response.template.should.eql('error-404');
+                    });
+            });
+
+            it('page', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/static-page-test/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('page');
+                    });
+            });
+        });
+    });
+
+    describe('extended routes.yaml (4): primary tag permalink', function () {
+        before(function () {
+            knexMock = new testUtils.mocks.knex();
+            knexMock.mock();
+        });
+
+        after(function () {
+            knexMock.unmock();
+        });
+
+        before(function () {
+            sandbox.stub(settingsService, 'get').returns({
+                routes: {},
+
+                collections: {
+                    '/something/': {
+                        permalink: '/something/:primary_tag/:slug/'
+                    }
+                },
+
+                taxonomies: {}
+            });
+
+            testUtils.integrationTesting.urlService.resetGenerators();
+            testUtils.integrationTesting.defaultMocks(sandbox);
+
+            return testUtils.integrationTesting.initGhost()
+                .then(function () {
+                    app = siteApp();
+
+                    return testUtils.integrationTesting.urlService.waitTillFinished();
+                });
+        });
+
+        beforeEach(function () {
+            testUtils.integrationTesting.overrideGhostConfig(configUtils);
+        });
+
+        afterEach(function () {
+            configUtils.restore();
+        });
+
+        after(function () {
+            sandbox.restore();
+        });
+
+        describe('behaviour: default cases', function () {
+            it('serve post', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/something/kitchen-sink/html-ipsum/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('post');
+                    });
+            });
+
+            it('post without tag', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/something/html-ipsum/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(404);
+                        response.template.should.eql('error-404');
+                    });
+            });
+
+            it('post without tag', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/html-ipsum/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(404);
+                        response.template.should.eql('error-404');
+                    });
+            });
+
+            it('page', function () {
+                const req = {
+                    secure: true,
+                    method: 'GET',
+                    url: '/static-page-test/',
+                    host: 'example.com'
+                };
+
+                return testUtils.mocks.express.invoke(app, req)
+                    .then(function (response) {
+                        response.statusCode.should.eql(200);
+                        response.template.should.eql('page');
                     });
             });
         });
diff --git a/core/test/unit/apps/amp/router_spec.js b/core/test/unit/apps/amp/router_spec.js
index 6d06952363..03bcc8c6ce 100644
--- a/core/test/unit/apps/amp/router_spec.js
+++ b/core/test/unit/apps/amp/router_spec.js
@@ -1,14 +1,12 @@
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
-    rewire = require('rewire'),
     path = require('path'),
-    Promise = require('bluebird'),
-
-    ampController = rewire('../../../../server/apps/amp/lib/router'),
+    ampController = require('../../../../server/apps/amp/lib/router'),
+    urlService = require('../../../../server/services/url'),
+    helpers = require('../../../../server/services/routing/helpers'),
     common = require('../../../../server/lib/common'),
+    testUtils = require('../../../utils'),
     configUtils = require('../../../utils/configUtils'),
-    themes = require('../../../../server/services/themes'),
-
     sandbox = sinon.sandbox.create();
 
 // Helper function to prevent unit tests
@@ -20,18 +18,17 @@ function failTest(done) {
     };
 }
 
-describe('AMP Controller', function () {
-    var res,
+describe('Unit - apps/amp/lib/router', function () {
+    let res,
         req,
         defaultPath,
-        hasTemplateStub;
+        rendererStub;
 
     beforeEach(function () {
-        hasTemplateStub = sandbox.stub().returns(false);
-        hasTemplateStub.withArgs('index').returns(true);
+        rendererStub = sandbox.stub();
 
-        sandbox.stub(themes, 'getActive').returns({
-            hasTemplate: hasTemplateStub
+        sandbox.stub(helpers, 'renderer').get(function () {
+            return rendererStub;
         });
 
         res = {
@@ -54,147 +51,115 @@ describe('AMP Controller', function () {
         };
 
         defaultPath = path.join(configUtils.config.get('paths').appRoot, '/core/server/apps/amp/lib/views/amp.hbs');
-
-        configUtils.set({
-            theme: {
-                permalinks: '/:slug/',
-                amp: true
-            }
-        });
     });
 
     afterEach(function () {
         sandbox.restore();
-        configUtils.restore();
     });
 
-    it('should render default amp page when theme has no amp template', function (done) {
-        res.render = function (view, data) {
-            view.should.eql(defaultPath);
-            data.should.eql({post: {title: 'test'}});
-            done();
-        };
+    describe('fn: renderer', function () {
+        it('should render default amp page when theme has no amp template', function (done) {
+            helpers.renderer.callsFake(function (req, res, data) {
+                res._route.defaultTemplate.should.eql(defaultPath);
+                data.should.eql({post: {title: 'test'}});
+                done();
+            });
 
-        ampController.renderer(req, res, failTest(done));
-    });
-
-    it('should render theme amp page when theme has amp template', function (done) {
-        hasTemplateStub.withArgs('amp').returns(true);
-
-        res.render = function (view, data) {
-            view.should.eql('amp');
-            data.should.eql({post: {title: 'test'}});
-            done();
-        };
-
-        ampController.renderer(req, res, failTest(done));
-    });
-
-    it('throws 404 when req.body has no post', function (done) {
-        req.body = {};
-
-        ampController.renderer(req, res, function (err) {
-            should.exist(err);
-            should.exist(err.message);
-            should.exist(err.statusCode);
-            should.exist(err.errorType);
-            err.message.should.be.eql('Page not found');
-            err.statusCode.should.be.eql(404);
-            err.errorType.should.be.eql('NotFoundError');
-            done();
+            ampController.renderer(req, res, failTest(done));
         });
-    });
 
-    it('throws 404 when req.body.post is a page', function (done) {
-        req.body = {
-            post: {
-                page: true
-            }
-        };
+        it('throws 404 when req.body has no post', function (done) {
+            req.body = {};
 
-        ampController.renderer(req, res, function (err) {
-            should.exist(err);
-            should.exist(err.message);
-            should.exist(err.statusCode);
-            should.exist(err.errorType);
-            err.message.should.be.eql('Page not found');
-            err.statusCode.should.be.eql(404);
-            err.errorType.should.be.eql('NotFoundError');
-            done();
+            ampController.renderer(req, res, function (err) {
+                (err instanceof common.errors.NotFoundError).should.be.true();
+                helpers.renderer.called.should.be.false();
+                done();
+            });
         });
-    });
-});
 
-describe('AMP getPostData', function () {
-    var res, req, postLookupStub, resetPostLookup, next;
-
-    beforeEach(function () {
-        res = {
-            locals: {
-                relativeUrl: '/welcome/amp/'
-            }
-        };
-
-        req = {
-            amp: {
-                post: {}
-            }
-        };
-
-        next = function () {
-        };
-
-        postLookupStub = sandbox.stub();
-        resetPostLookup = ampController.__set__('postLookup', postLookupStub);
-    });
-
-    afterEach(function () {
-        sandbox.restore();
-        resetPostLookup();
-    });
-
-    it('should successfully get the post data from slug', function (done) {
-        postLookupStub.returns(new Promise.resolve({
-            post: {
-                id: '1',
-                slug: 'welcome'
-            }
-        }));
-
-        ampController.getPostData(req, res, function () {
-            req.body.post.should.be.eql({
-                    id: '1',
-                    slug: 'welcome'
+        it('throws 404 when req.body.post is a page', function (done) {
+            req.body = {
+                post: {
+                    page: true
                 }
-            );
-            done();
+            };
+
+            ampController.renderer(req, res, function (err) {
+                (err instanceof common.errors.NotFoundError).should.be.true();
+                helpers.renderer.called.should.be.false();
+                done();
+            });
         });
     });
 
-    it('should return error if postlookup returns NotFoundError', function (done) {
-        postLookupStub.returns(new Promise.reject(new common.errors.NotFoundError({message: 'not found'})));
+    describe('fn: getPostData', function () {
+        let res, req, postLookupStub, post;
 
-        ampController.getPostData(req, res, function (err) {
-            should.exist(err);
-            should.exist(err.message);
-            should.exist(err.statusCode);
-            should.exist(err.errorType);
-            err.message.should.be.eql('not found');
-            err.statusCode.should.be.eql(404);
-            err.errorType.should.be.eql('NotFoundError');
-            req.body.should.be.eql({});
-            done();
+        beforeEach(function () {
+            post = testUtils.DataGenerator.forKnex.createPost({slug: 'welcome'});
+
+            res = {
+                locals: {}
+            };
+
+            req = {};
+
+            postLookupStub = sandbox.stub();
+
+            sandbox.stub(helpers, 'postLookup').get(function () {
+                return postLookupStub;
+            });
+
+            sandbox.stub(urlService, 'getPermalinkByUrl');
         });
-    });
 
-    it('should return error and if postlookup returns error', function (done) {
-        postLookupStub.returns(new Promise.reject('not found'));
+        afterEach(function () {
+            sandbox.restore();
+        });
 
-        ampController.getPostData(req, res, function (err) {
-            should.exist(err);
-            err.should.be.eql('not found');
-            req.body.should.be.eql({});
-            done();
+        it('should successfully get the post data from slug', function (done) {
+            res.locals.relativeUrl = req.originalUrl = '/welcome/amp';
+
+            urlService.getPermalinkByUrl.withArgs('/welcome/').returns('/:slug/');
+
+            helpers.postLookup.withArgs('/welcome/', {permalinks: '/:slug/'}).resolves({
+                post: post
+            });
+
+            ampController.getPostData(req, res, function () {
+                req.body.post.should.be.eql(post);
+                done();
+            });
+        });
+
+        it('subdirectory: should successfully get the post data from slug', function (done) {
+            req.originalUrl = '/blog/welcome/amp';
+            res.locals.relativeUrl = '/welcome/amp';
+
+            urlService.getPermalinkByUrl.withArgs('/blog/welcome/').returns('/:slug/');
+
+            helpers.postLookup.withArgs('/welcome/', {permalinks: '/:slug/'}).resolves({
+                post: post
+            });
+
+            ampController.getPostData(req, res, function () {
+                req.body.post.should.be.eql(post);
+                done();
+            });
+        });
+
+        it('should return error if postlookup returns NotFoundError', function (done) {
+            res.locals.relativeUrl = req.originalUrl = '/welcome/amp';
+
+            urlService.getPermalinkByUrl.withArgs('/welcome/').returns('/:slug/');
+
+            helpers.postLookup.withArgs('/welcome/', {permalinks: '/:slug/'}).rejects(new common.errors.NotFoundError());
+
+            ampController.getPostData(req, res, function (err) {
+                (err instanceof common.errors.NotFoundError).should.be.true();
+                done();
+            });
         });
     });
 });
diff --git a/core/test/unit/controllers/entry_spec.js b/core/test/unit/controllers/entry_spec.js
deleted file mode 100644
index 5702050036..0000000000
--- a/core/test/unit/controllers/entry_spec.js
+++ /dev/null
@@ -1,689 +0,0 @@
-var should = require('should'),
-    sinon = require('sinon'),
-    moment = require('moment'),
-    Promise = require('bluebird'),
-    _ = require('lodash'),
-
-    // Test utils
-    configUtils = require('../../utils/configUtils'),
-    markdownToMobiledoc = require('../../utils/fixtures/data-generator').markdownToMobiledoc,
-
-    // Server requires
-    api = require('../../../server/api'),
-    controllers = require('../../../server/controllers'),
-    themes = require('../../../server/services/themes'),
-    settingsCache = require('../../../server/services/settings/cache'),
-
-    sandbox = sinon.sandbox.create();
-
-describe('Controllers', function () {
-    var adminEditPagePath = '/ghost/editor/',
-        localSettingsCache = {},
-        hasTemplateStub;
-
-    function resetLocalSettingsCache() {
-        localSettingsCache = {
-            permalinks: '/:slug/',
-            active_theme: 'casper'
-        };
-    }
-
-    afterEach(function () {
-        sandbox.restore();
-        configUtils.restore();
-    });
-
-    // Ensure hasTemplate returns values
-    function setupActiveTheme() {
-        hasTemplateStub = sandbox.stub().returns(false);
-        hasTemplateStub.withArgs('default').returns(true);
-        hasTemplateStub.withArgs('index').returns(true);
-        hasTemplateStub.withArgs('page').returns(true);
-        hasTemplateStub.withArgs('page-about').returns(true);
-        hasTemplateStub.withArgs('post').returns(true);
-
-        sandbox.stub(themes, 'getActive').returns({
-            hasTemplate: hasTemplateStub
-        });
-
-        sandbox.stub(settingsCache, 'get').callsFake(function (key) {
-            return localSettingsCache[key];
-        });
-    }
-
-    beforeEach(function () {
-        resetLocalSettingsCache();
-        setupActiveTheme();
-    });
-
-    // Helper function to prevent unit tests
-    // from failing via timeout when they
-    // should just immediately fail
-    function failTest(done) {
-        return function (err) {
-            done(err);
-        };
-    }
-
-    describe('entry', function () {
-        var req, res, mockPosts = [{
-            posts: [{
-                status: 'published',
-                id: 1,
-                title: 'Test static page',
-                slug: 'test-static-page',
-                mobiledoc: markdownToMobiledoc('Test static page content'),
-                page: 1,
-                published_at: new Date('2013/12/30').getTime(),
-                author: {
-                    id: 1,
-                    name: 'Test User',
-                    slug: 'test',
-                    email: 'test@ghost.org'
-                },
-                url: '/test-static-page/'
-            }]
-        }, {
-            posts: [{
-                status: 'published',
-                id: 2,
-                title: 'Test normal post',
-                slug: 'test-normal-post',
-                mobiledoc: markdownToMobiledoc('The test normal post content'),
-                page: 0,
-                published_at: new Date('2014/1/2').getTime(),
-                author: {
-                    id: 1,
-                    name: 'Test User',
-                    slug: 'test',
-                    email: 'test@ghost.org'
-                }
-            }]
-        }, {
-            posts: [{
-                status: 'published',
-                id: 3,
-                title: 'About',
-                slug: 'about',
-                mobiledoc: markdownToMobiledoc('This is the about page content'),
-                page: 1,
-                published_at: new Date('2014/1/30').getTime(),
-                author: {
-                    id: 1,
-                    name: 'Test User',
-                    slug: 'test',
-                    email: 'test@ghost.org'
-                },
-                url: '/about/'
-            }]
-        }];
-
-        beforeEach(function () {
-            sandbox.stub(api.posts, 'read').callsFake(function (args) {
-                var post = _.find(mockPosts, function (mock) {
-                    return mock.posts[0].slug === args.slug;
-                });
-
-                return Promise.resolve(post || {posts: []});
-            });
-
-            req = {
-                path: '/', params: {}, route: {}
-            };
-
-            res = {
-                locals: {},
-                render: sinon.spy(),
-                redirect: sinon.spy()
-            };
-        });
-
-        describe('static pages', function () {
-            describe('custom page templates', function () {
-                it('it will render a custom page-slug template if it exists', function (done) {
-                    req.path = '/' + mockPosts[2].posts[0].slug + '/';
-                    req.route = {path: '*'};
-                    res.render = function (view, context) {
-                        view.should.equal('page-' + mockPosts[2].posts[0].slug);
-                        context.post.should.equal(mockPosts[2].posts[0]);
-                        done();
-                    };
-                    mockPosts[2].posts[0].url = req.path;
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('it will use page.hbs if it exists and no page-slug template is present', function (done) {
-                    hasTemplateStub.withArgs('page-about').returns(false);
-
-                    req.path = '/' + mockPosts[2].posts[0].slug + '/';
-                    req.route = {path: '*'};
-                    res.render = function (view, context) {
-                        view.should.equal('page');
-                        context.post.should.equal(mockPosts[2].posts[0]);
-                        done();
-                    };
-                    mockPosts[2].posts[0].url = req.path;
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('defaults to post.hbs without a page.hbs or page-slug template', function (done) {
-                    hasTemplateStub.withArgs('page-about').returns(false);
-                    hasTemplateStub.withArgs('page').returns(false);
-
-                    req.path = '/' + mockPosts[2].posts[0].slug + '/';
-                    req.route = {path: '*'};
-                    res.render = function (view, context) {
-                        view.should.equal('post');
-                        context.post.should.equal(mockPosts[2].posts[0]);
-                        done();
-                    };
-                    mockPosts[2].posts[0].url = req.path;
-
-                    controllers.entry(req, res, failTest(done));
-                });
-            });
-
-            describe('permalink set to slug', function () {
-                it('will render static page via /:slug/', function (done) {
-                    req.path = '/' + mockPosts[0].posts[0].slug + '/';
-                    req.route = {path: '*'};
-                    res.render = function (view, context) {
-                        view.should.equal('page');
-                        context.post.should.equal(mockPosts[0].posts[0]);
-                        done();
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT render static page via /YYY/MM/DD/:slug', function (done) {
-                    req.path = '/' + ['2012/12/30', mockPosts[0].posts[0].slug].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT render static page via /:author/:slug', function (done) {
-                    req.path = '/' + ['test', mockPosts[0].posts[0].slug].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will redirect static page to admin edit page via /:slug/edit', function (done) {
-                    req.path = '/' + [mockPosts[0].posts[0].slug, 'edit'].join('/') + '/';
-                    res.redirect = function (arg) {
-                        res.render.called.should.be.false();
-                        arg.should.eql(adminEditPagePath + mockPosts[0].posts[0].id + '/');
-                        done();
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT redirect static page to admin edit page via /YYYY/MM/DD/:slug/edit', function (done) {
-                    req.path = '/' + ['2012/12/30', mockPosts[0].posts[0].slug, 'edit'].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT redirect static page to admin edit page via /:author/:slug/edit', function (done) {
-                    req.path = '/' + ['test', mockPosts[0].posts[0].slug, 'edit'].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-            });
-
-            describe('permalink set to date', function () {
-                beforeEach(function () {
-                    localSettingsCache.permalinks = '/:year/:month/:day/:slug/';
-                });
-
-                it('will render static page via /:slug', function (done) {
-                    req.path = '/' + mockPosts[0].posts[0].slug + '/';
-                    req.route = {path: '*'};
-                    res.render = function (view, context) {
-                        view.should.equal('page');
-                        context.post.should.equal(mockPosts[0].posts[0]);
-                        done();
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT render static page via /YYYY/MM/DD/:slug', function (done) {
-                    req.path = '/' + ['2012/12/30', mockPosts[0].posts[0].slug].join('/') + '/';
-                    res.render = sinon.spy();
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will redirect static page to admin edit page via /:slug/edit', function (done) {
-                    req.path = '/' + [mockPosts[0].posts[0].slug, 'edit'].join('/') + '/';
-                    res.render = sinon.spy();
-                    res.redirect = function (arg) {
-                        res.render.called.should.be.false();
-                        arg.should.eql(adminEditPagePath + mockPosts[0].posts[0].id + '/');
-                        done();
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT redirect static page to admin edit page via /YYYY/MM/DD/:slug/edit', function (done) {
-                    req.path = '/' + ['2012/12/30', mockPosts[0].posts[0].slug, 'edit'].join('/') + '/';
-                    res.render = sinon.spy();
-                    res.redirect = sinon.spy();
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-            });
-        });
-
-        describe('post', function () {
-            describe('permalink set to slug', function () {
-                beforeEach(function () {
-                    mockPosts[1].posts[0].url = '/' + mockPosts[1].posts[0].slug + '/';
-                });
-
-                it('will render post via /:slug/', function (done) {
-                    req.path = '/' + mockPosts[1].posts[0].slug + '/';
-                    req.route = {path: '*'};
-                    res.render = function (view, context) {
-                        view.should.equal('post');
-                        should.exist(context.post);
-                        context.post.should.equal(mockPosts[1].posts[0]);
-                        done();
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT render post via /YYYY/MM/DD/:slug', function (done) {
-                    req.path = '/' + ['2012/12/30', mockPosts[1].posts[0].slug].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT render post via /:author/:slug', function (done) {
-                    req.path = '/' + ['test', mockPosts[1].posts[0].slug].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                // Handle Edit append
-                it('will redirect post to admin edit page via /:slug/edit', function (done) {
-                    req.path = '/' + [mockPosts[1].posts[0].slug, 'edit'].join('/') + '/';
-                    res.redirect = function (arg) {
-                        res.render.called.should.be.false();
-                        arg.should.eql(adminEditPagePath + mockPosts[1].posts[0].id + '/');
-                        done();
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT redirect post to admin edit page via /YYYY/MM/DD/:slug/edit', function (done) {
-                    req.path = '/' + ['2012/12/30', mockPosts[1].posts[0].slug, 'edit'].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT redirect post to admin edit page via /:author/:slug/edit', function (done) {
-                    req.path = '/' + ['test', mockPosts[1].posts[0].slug, 'edit'].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('should call next if post is not found', function (done) {
-                    req.path = '/unknown/';
-
-                    controllers.entry(req, res, function (err) {
-                        if (err) {
-                            return done(err);
-                        }
-
-                        should.not.exist(err);
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-            });
-
-            describe('permalink set to date', function () {
-                beforeEach(function () {
-                    localSettingsCache.permalinks = '/:year/:month/:day/:slug/';
-
-                    var date = moment(mockPosts[1].posts[0].published_at).format('YYYY/MM/DD');
-                    mockPosts[1].posts[0].url = '/' + date + '/' + mockPosts[1].posts[0].slug + '/';
-                });
-
-                it('will render post via /YYYY/MM/DD/:slug/', function (done) {
-                    var date = moment(mockPosts[1].posts[0].published_at).format('YYYY/MM/DD');
-                    req.path = '/' + [date, mockPosts[1].posts[0].slug].join('/') + '/';
-                    req.route = {path: '*'};
-
-                    res.render = function (view, context) {
-                        view.should.equal('post');
-                        should.exist(context.post);
-                        context.post.should.equal(mockPosts[1].posts[0]);
-                        done();
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT render post via /:slug/', function (done) {
-                    req.path = '/' + mockPosts[1].posts[0].slug + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT render post via /:author/:slug/', function (done) {
-                    req.path = '/' + ['test', mockPosts[1].posts[0].slug].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                // Handle Edit append
-                it('will redirect post to admin edit page via /YYYY/MM/DD/:slug/edit/', function (done) {
-                    var dateFormat = moment(mockPosts[1].posts[0].published_at).format('YYYY/MM/DD');
-
-                    req.path = '/' + [dateFormat, mockPosts[1].posts[0].slug, 'edit'].join('/') + '/';
-                    res.redirect = function (arg) {
-                        res.render.called.should.be.false();
-                        arg.should.eql(adminEditPagePath + mockPosts[1].posts[0].id + '/');
-                        done();
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT redirect post to admin edit page via /:slug/edit/', function (done) {
-                    req.path = '/' + [mockPosts[1].posts[0].slug, 'edit'].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT redirect post to admin edit page via /:author/:slug/edit/', function (done) {
-                    req.path = '/' + ['test', mockPosts[1].posts[0].slug, 'edit'].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-            });
-
-            describe('permalink set to author', function () {
-                beforeEach(function () {
-                    localSettingsCache.permalinks = 'author/:slug/';
-
-                    // set post url to permalink-defined url
-                    mockPosts[1].posts[0].url = '/test/' + mockPosts[1].posts[0].slug + '/';
-                });
-
-                it('will render post via /:author/:slug/', function (done) {
-                    req.path = '/' + ['test', mockPosts[1].posts[0].slug].join('/') + '/';
-                    req.route = {path: '*'};
-                    res.render = function (view, context) {
-                        view.should.equal('post');
-                        should.exist(context.post);
-                        context.post.should.equal(mockPosts[1].posts[0]);
-                        done();
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT render post via /YYYY/MM/DD/:slug/', function (done) {
-                    var date = moment(mockPosts[1].posts[0].published_at).format('YYYY/MM/DD');
-                    req.path = '/' + [date, mockPosts[1].posts[0].slug].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT render post via /:author/:slug/ when author does not match post author', function (done) {
-                    req.path = '/' + ['test-2', mockPosts[1].posts[0].slug].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT render post via /:slug/', function (done) {
-                    req.path = '/' + mockPosts[1].posts[0].slug + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                // Handle Edit append
-                it('will redirect post to admin edit page via /:author/:slug/edit/', function (done) {
-                    req.path = '/' + ['test', mockPosts[1].posts[0].slug, 'edit'].join('/') + '/';
-
-                    res.redirect = function (arg) {
-                        res.render.called.should.be.false();
-                        arg.should.eql(adminEditPagePath + mockPosts[1].posts[0].id + '/');
-                        done();
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT redirect post to admin edit page via /YYYY/MM/DD/:slug/edit/', function (done) {
-                    var date = moment(mockPosts[1].posts[0].published_at).format('YYYY/MM/DD');
-                    req.path = '/' + [date, mockPosts[1].posts[0].slug, 'edit'].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT redirect post to admin edit page /:slug/edit/', function (done) {
-                    req.path = '/' + [mockPosts[1].posts[0].slug, 'edit'].join('/') + '/';
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-            });
-
-            describe('permalink set to custom format', function () {
-                beforeEach(function () {
-                    localSettingsCache.permalinks = '/:year/:slug/';
-
-                    var date = moment(mockPosts[1].posts[0].published_at).format('YYYY');
-                    mockPosts[1].posts[0].url = '/' + date + '/' + mockPosts[1].posts[0].slug + '/';
-                });
-
-                it('will render post via /:year/:slug/', function (done) {
-                    var date = moment(mockPosts[1].posts[0].published_at).format('YYYY');
-
-                    req.path = '/' + [date, mockPosts[1].posts[0].slug].join('/') + '/';
-                    req.route = {path: '*'};
-
-                    res = {
-                        locals: {},
-                        render: function (view, context) {
-                            view.should.equal('post');
-                            should.exist(context.post);
-                            context.post.should.equal(mockPosts[1].posts[0]);
-                            done();
-                        }
-                    };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT render post via /YYYY/MM/DD/:slug/', function (done) {
-                    var date = moment(mockPosts[1].posts[0].published_at).format('YYYY/MM/DD'),
-                        req = {
-                            path: '/' + [date, mockPosts[1].posts[0].slug].join('/') + '/'
-                        },
-                        res = {
-                            locals: {},
-                            render: sinon.spy()
-                        };
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT render post via /:year/slug/ when year does not match post year', function (done) {
-                    var date = moment(mockPosts[1].posts[0].published_at).subtract(1, 'years').format('YYYY'),
-                        req = {
-                            path: '/' + [date, mockPosts[1].posts[0].slug].join('/') + '/'
-                        },
-                        res = {
-                            locals: {},
-                            render: sinon.spy()
-                        };
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                it('will NOT render post via /:slug/', function (done) {
-                    var req = {
-                            path: '/' + mockPosts[1].posts[0].slug + '/'
-                        },
-                        res = {
-                            locals: {},
-                            render: sinon.spy()
-                        };
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        done();
-                    });
-                });
-
-                // Handle Edit append
-                it('will redirect post to admin edit page via /:year/:slug/edit/', function (done) {
-                    var date = moment(mockPosts[1].posts[0].published_at).format('YYYY'),
-                        req = {
-                            path: '/' + [date, mockPosts[1].posts[0].slug, 'edit'].join('/') + '/'
-                        },
-                        res = {
-                            locals: {},
-                            render: sinon.spy(),
-                            redirect: function (arg) {
-                                res.render.called.should.be.false();
-                                arg.should.eql(adminEditPagePath + mockPosts[1].posts[0].id + '/');
-                                done();
-                            }
-                        };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-
-                it('will NOT redirect post to admin edit page /:slug/edit/', function (done) {
-                    var req = {
-                            path: '/' + [mockPosts[1].posts[0].slug, 'edit'].join('/') + '/'
-                        },
-                        res = {
-                            locals: {},
-                            render: sinon.spy(),
-                            redirect: sinon.spy()
-                        };
-
-                    controllers.entry(req, res, function () {
-                        res.render.called.should.be.false();
-                        res.redirect.called.should.be.false();
-                        done();
-                    });
-                });
-            });
-
-            describe('permalink set to custom format no slash', function () {
-                beforeEach(function () {
-                    localSettingsCache.permalinks = '/:year/:slug/';
-
-                    var date = moment(mockPosts[1].posts[0].published_at).format('YYYY');
-                    mockPosts[1].posts[0].url = '/' + date + '/' + mockPosts[1].posts[0].slug + '/';
-                });
-
-                // Handle Edit append
-                it('will redirect post to admin edit page via /:year/:id/edit/', function (done) {
-                    var date = moment(mockPosts[1].posts[0].published_at).format('YYYY'),
-                        req = {
-                            path: '/' + [date, mockPosts[1].posts[0].slug, 'edit'].join('/') + '/'
-                        },
-                        res = {
-                            locals: {},
-                            render: sinon.spy(),
-                            redirect: function (arg) {
-                                res.render.called.should.be.false();
-                                arg.should.eql(adminEditPagePath + mockPosts[1].posts[0].id + '/');
-                                done();
-                            }
-                        };
-
-                    controllers.entry(req, res, failTest(done));
-                });
-            });
-        });
-    });
-});
diff --git a/core/test/unit/controllers/frontend/context_spec.js b/core/test/unit/controllers/frontend/context_spec.js
deleted file mode 100644
index 90c01d980f..0000000000
--- a/core/test/unit/controllers/frontend/context_spec.js
+++ /dev/null
@@ -1,446 +0,0 @@
-var should = require('should'),
-    sinon = require('sinon'),
-    _ = require('lodash'),
-
-    // Stuff we are testing
-    channelUtils = require('../../../utils/channelUtils'),
-    setResponseContext = require('../../../../server/controllers/frontend/context'),
-    labs = require('../../../../server/services/labs'),
-
-    sandbox = sinon.sandbox.create();
-
-describe('Contexts', function () {
-    var req, res, data, setupContext;
-
-    beforeEach(function () {
-        req = {
-            params: {},
-            body: {}
-        };
-        res = {
-            locals: {}
-        };
-        data = {};
-    });
-
-    afterEach(function () {
-        sandbox.restore();
-    });
-
-    /**
-     * A context is created based on the URL, and the channel config if we're rendering
-     * any part of a channel
-     * @param {String} url
-     * @param {String|Object|Integer} [channel]
-     * @param {Integer} [pageParam]
-     */
-    setupContext = function setupContext(url, channel, pageParam) {
-        res.locals.relativeUrl = url;
-
-        if (channel && _.isString(channel)) {
-            res.locals.channel = channelUtils.getTestChannel(channel);
-        } else if (channel && _.isNumber(channel)) {
-            pageParam = channel;
-        } else if (channel) {
-            res.locals.channel = channel;
-        }
-
-        if (pageParam) {
-            req.params.page = pageParam;
-        }
-    };
-
-    describe('Unknown', function () {
-        it('should return empty array with no error if all parameters are empty', function () {
-            // Reset all parameters to empty;
-            req = {};
-            res = {};
-            data = {};
-
-            // Execute test
-            setResponseContext(req, res, data);
-
-            // Check context
-            should.exist(res.locals.context);
-            res.locals.context.should.be.an.Array().with.lengthOf(0);
-        });
-
-        it('should return empty array with no error with basic parameters', function () {
-            // Setup test
-            // BeforeEach sets each of these to the bare minimum that should be provided for determining context
-
-            // Execute test
-            setResponseContext(req, res, data);
-
-            // Check context
-            should.exist(res.locals.context);
-            res.locals.context.should.be.an.Array().with.lengthOf(0);
-        });
-    });
-
-    describe('Channels', function () {
-        describe('Index', function () {
-            it('should correctly identify index channel', function () {
-                // Setup test
-                setupContext('/does/not/matter/', 'index');
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(1);
-                res.locals.context[0].should.eql('index');
-            });
-
-            it('should correctly identify / as home', function () {
-                // Setup test
-                setupContext('/', 'index');
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(2);
-                res.locals.context[0].should.eql('home');
-                res.locals.context[1].should.eql('index');
-            });
-
-            it('will not identify / as index without config', function () {
-                // Setup test
-                setupContext('/');
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(1);
-                res.locals.context[0].should.eql('home');
-            });
-
-            it('will not identify /page/2/ as index & paged without page param', function () {
-                // Setup test
-                setupContext('/page/2/', 'index');
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(1);
-                res.locals.context[0].should.eql('index');
-            });
-
-            it('should identify /page/2/ as index & paged with page param', function () {
-                // Setup test
-                setupContext('/page/2/', 'index', 2);
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(2);
-                res.locals.context[0].should.eql('paged');
-                res.locals.context[1].should.eql('index');
-            });
-        });
-
-        describe('Tag', function () {
-            it('should correctly identify tag channel', function () {
-                // Setup test
-                setupContext('/tag/getting-started/', 'tag');
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(1);
-                res.locals.context[0].should.eql('tag');
-            });
-
-            it('will not identify tag channel url without config', function () {
-                // Setup test
-                setupContext('/tag/getting-started/');
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(0);
-            });
-
-            it('will not identify /page/2/ as paged without page param', function () {
-                // Setup test
-                setupContext('/tag/getting-started/page/2/', 'tag');
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(1);
-                res.locals.context[0].should.eql('tag');
-            });
-
-            it('should correctly identify /page/2/ as paged with page param', function () {
-                // Setup test
-                setupContext('/tag/getting-started/page/2/', 'tag', 2);
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(2);
-                res.locals.context[0].should.eql('paged');
-                res.locals.context[1].should.eql('tag');
-            });
-        });
-
-        describe('Author', function () {
-            it('should correctly identify author channel', function () {
-                // Setup test
-                setupContext('/author/pat/', 'author');
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(1);
-                res.locals.context[0].should.eql('author');
-            });
-
-            it('will not identify author channel url without config', function () {
-                // Setup test
-                setupContext('/author/pat/');
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(0);
-            });
-
-            it('will not identify /page/2/ as paged without page param', function () {
-                // Setup test
-                setupContext('/author/pat/page/2/', 'author');
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(1);
-                res.locals.context[0].should.eql('author');
-            });
-
-            it('should correctly identify /page/2/ as paged with page param', function () {
-                // Setup test
-                setupContext('/author/pat/page/2/', 'author', 2);
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(2);
-                res.locals.context[0].should.eql('paged');
-                res.locals.context[1].should.eql('author');
-            });
-        });
-
-        describe('Custom', function () {
-            var featuredChannel = new channelUtils.Channel('featured');
-
-            it('will use the channel name for a custom channel', function () {
-                // Setup test
-                setupContext('/featured/', featuredChannel);
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(1);
-                res.locals.context[0].should.eql('featured');
-            });
-
-            it('will use a custom context for a custom channel', function () {
-                var channel = _.clone(featuredChannel);
-                channel.context = ['custom-context', 'test'];
-
-                // Setup test
-                setupContext('/featured/', channel);
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(2);
-                res.locals.context[0].should.eql('custom-context');
-                res.locals.context[1].should.eql('test');
-            });
-
-            it('will not identify /page/2/ as paged without page param', function () {
-                // Setup test
-                setupContext('/featured/page/2/', featuredChannel);
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(1);
-                res.locals.context[0].should.eql('featured');
-            });
-
-            it('should correctly identify /page/2/ as paged with page param', function () {
-                // Setup test
-                setupContext('/featured/page/2/', featuredChannel, 2);
-
-                // Execute test
-                setResponseContext(req, res, data);
-
-                // Check context
-                should.exist(res.locals.context);
-                res.locals.context.should.be.an.Array().with.lengthOf(2);
-                res.locals.context[0].should.eql('paged');
-                res.locals.context[1].should.eql('featured');
-            });
-        });
-    });
-
-    describe('Posts & Pages', function () {
-        it('should correctly identify a post', function () {
-            // Setup test
-            setupContext('/welcome-to-ghost/');
-            data.post = {};
-
-            // Execute test
-            setResponseContext(req, res, data);
-
-            // Check context
-            should.exist(res.locals.context);
-            res.locals.context.should.be.an.Array().with.lengthOf(1);
-            res.locals.context[0].should.eql('post');
-        });
-
-        it('will not identify a post without data being set', function () {
-            // Setup test
-            setupContext('/welcome-to-ghost/');
-
-            // Execute test
-            setResponseContext(req, res, data);
-
-            // Check context
-            should.exist(res.locals.context);
-            res.locals.context.should.be.an.Array().with.lengthOf(0);
-        });
-
-        it('should correctly identify a page', function () {
-            // Setup test
-            setupContext('/about/');
-            data.post = {page: true};
-
-            // Execute test
-            setResponseContext(req, res, data);
-
-            // Check context
-            should.exist(res.locals.context);
-            res.locals.context.should.be.an.Array().with.lengthOf(1);
-            res.locals.context[0].should.eql('page');
-        });
-    });
-
-    describe('Private', function () {
-        it('should correctly identify /private/ as the private route', function () {
-            // Setup test
-            setupContext('/private/?r=');
-
-            // Execute test
-            setResponseContext(req, res, data);
-
-            // Check context
-            should.exist(res.locals.context);
-            res.locals.context.should.be.an.Array().with.lengthOf(1);
-            res.locals.context[0].should.eql('private');
-        });
-    });
-
-    describe('Subscribe', function () {
-        it('should identify /subscribe/ as the subscribe route if labs flag set', function () {
-            // Setup test
-            sandbox.stub(labs, 'isSet').returns(true);
-            setupContext('/subscribe/');
-            data.post = {
-                page: false
-            };
-
-            // Execute test
-            setResponseContext(req, res, data);
-
-            // Check context
-            should.exist(res.locals.context);
-            res.locals.context.should.be.an.Array().with.lengthOf(1);
-            res.locals.context[0].should.eql('subscribe');
-        });
-
-        it('should not identify /subscribe/ as subscribe route if labs flag NOT set', function () {
-            // Setup test
-            sandbox.stub(labs, 'isSet').returns(false);
-            setupContext('/subscribe/');
-            data.post = {
-                page: false
-            };
-
-            // Execute test
-            setResponseContext(req, res, data);
-
-            // Check context
-            should.exist(res.locals.context);
-            res.locals.context.should.be.an.Array().with.lengthOf(1);
-            res.locals.context[0].should.eql('post');
-        });
-    });
-
-    describe('AMP', function () {
-        it('should correctly identify an AMP post', function () {
-            // Setup test
-            setupContext('/welcome-to-ghost/amp/');
-            data.post = {
-                page: false
-            };
-
-            // Execute test
-            setResponseContext(req, res, data);
-            // Check context
-            should.exist(res.locals.context);
-            res.locals.context.should.be.an.Array().with.lengthOf(2);
-            res.locals.context[0].should.eql('amp');
-            res.locals.context[1].should.eql('post');
-        });
-
-        it('should correctly identify an AMP page', function () {
-            // Setup test
-            setupContext('/welcome-to-ghost/amp/');
-            data.post = {
-                page: true
-            };
-
-            // Execute test
-            setResponseContext(req, res, data);
-            // Check context
-            should.exist(res.locals.context);
-            res.locals.context.should.be.an.Array().with.lengthOf(2);
-            res.locals.context[0].should.eql('amp');
-            res.locals.context[1].should.eql('page');
-        });
-    });
-});
diff --git a/core/test/unit/controllers/frontend/fetch-data_spec.js b/core/test/unit/controllers/frontend/fetch-data_spec.js
deleted file mode 100644
index 7d0eaeda55..0000000000
--- a/core/test/unit/controllers/frontend/fetch-data_spec.js
+++ /dev/null
@@ -1,187 +0,0 @@
-var should = require('should'),
-    sinon = require('sinon'),
-    Promise = require('bluebird'),
-    // Stuff we are testing
-    api = require('../../../../server/api'),
-    themes = require('../../../../server/services/themes'),
-    fetchData = require('../../../../server/controllers/frontend/fetch-data'),
-    configUtils = require('../../../utils/configUtils'),
-    sandbox = sinon.sandbox.create();
-
-describe('fetchData', function () {
-    var apiPostsStub,
-        apiTagStub,
-        apiUserStub,
-        themeConfigStub;
-
-    beforeEach(function () {
-        apiPostsStub = sandbox.stub(api.posts, 'browse')
-            .returns(new Promise.resolve({posts: [], meta: {pagination: {}}}));
-
-        apiTagStub = sandbox.stub(api.tags, 'read').returns(new Promise.resolve({tags: []}));
-        apiUserStub = sandbox.stub(api.users, 'read').returns(new Promise.resolve({users: []}));
-
-        themeConfigStub = sandbox.stub().withArgs('posts_per_page').returns(10);
-
-        sandbox.stub(themes, 'getActive').returns({
-            config: themeConfigStub
-        });
-    });
-
-    afterEach(function () {
-        configUtils.restore();
-        sandbox.restore();
-    });
-
-    describe('channel config', function () {
-        it('should handle no post options', function (done) {
-            fetchData({}).then(function (result) {
-                should.exist(result);
-                result.should.be.an.Object().with.properties('posts', 'meta');
-                result.should.not.have.property('data');
-
-                apiPostsStub.calledOnce.should.be.true();
-                apiPostsStub.firstCall.args[0].should.be.an.Object();
-                apiPostsStub.firstCall.args[0].should.have.property('include');
-                apiPostsStub.firstCall.args[0].should.have.property('limit', 10);
-
-                done();
-            }).catch(done);
-        });
-
-        it('should handle post options with only page', function (done) {
-            fetchData({postOptions: {page: 2}}).then(function (result) {
-                should.exist(result);
-                result.should.be.an.Object().with.properties('posts', 'meta');
-                result.should.not.have.property('data');
-
-                apiPostsStub.calledOnce.should.be.true();
-                apiPostsStub.firstCall.args[0].should.be.an.Object();
-                apiPostsStub.firstCall.args[0].should.have.property('include');
-                apiPostsStub.firstCall.args[0].should.have.property('limit', 10);
-                apiPostsStub.firstCall.args[0].should.have.property('page', 2);
-
-                done();
-            }).catch(done);
-        });
-
-        it('should handle multiple queries', function (done) {
-            var channelOpts = {
-                data: {
-                    featured: {
-                        type: 'browse',
-                        resource: 'posts',
-                        options: {
-                            filter: 'featured:true',
-                            limit: 3
-                        }
-                    }
-                }
-            };
-
-            fetchData(channelOpts).then(function (result) {
-                should.exist(result);
-                result.should.be.an.Object().with.properties('posts', 'meta', 'data');
-                result.data.should.be.an.Object().with.properties('featured');
-                result.data.featured.should.be.an.Object().with.properties('posts', 'meta');
-                result.data.featured.should.not.have.properties('data');
-
-                apiPostsStub.calledTwice.should.be.true();
-                apiPostsStub.firstCall.args[0].should.have.property('include', 'author,authors,tags');
-                apiPostsStub.firstCall.args[0].should.have.property('limit', 10);
-                apiPostsStub.secondCall.args[0].should.have.property('filter', 'featured:true');
-                apiPostsStub.secondCall.args[0].should.have.property('limit', 3);
-                done();
-            }).catch(done);
-        });
-
-        it('should handle multiple queries with page param', function (done) {
-            var channelOpts = {
-                postOptions: {
-                    page: 2
-                },
-                data: {
-                    featured: {
-                        type: 'browse',
-                        resource: 'posts',
-                        options: {filter: 'featured:true', limit: 3}
-                    }
-                }
-            };
-
-            fetchData(channelOpts).then(function (result) {
-                should.exist(result);
-
-                result.should.be.an.Object().with.properties('posts', 'meta', 'data');
-                result.data.should.be.an.Object().with.properties('featured');
-                result.data.featured.should.be.an.Object().with.properties('posts', 'meta');
-                result.data.featured.should.not.have.properties('data');
-
-                apiPostsStub.calledTwice.should.be.true();
-                apiPostsStub.firstCall.args[0].should.have.property('include', 'author,authors,tags');
-                apiPostsStub.firstCall.args[0].should.have.property('limit', 10);
-                apiPostsStub.firstCall.args[0].should.have.property('page', 2);
-                apiPostsStub.secondCall.args[0].should.have.property('filter', 'featured:true');
-                apiPostsStub.secondCall.args[0].should.have.property('limit', 3);
-                done();
-            }).catch(done);
-        });
-
-        it('should handle queries with slug replacements', function (done) {
-            var channelOpts = {
-                postOptions: {
-                    filter: 'tags:%s'
-                },
-                slugParam: 'testing',
-                data: {
-                    tag: {
-                        type: 'read',
-                        resource: 'tags',
-                        options: {slug: '%s'}
-                    }
-                }
-            };
-
-            fetchData(channelOpts).then(function (result) {
-                should.exist(result);
-                result.should.be.an.Object().with.properties('posts', 'meta', 'data');
-                result.data.should.be.an.Object().with.properties('tag');
-
-                apiPostsStub.calledOnce.should.be.true();
-                apiPostsStub.firstCall.args[0].should.have.property('include');
-                apiPostsStub.firstCall.args[0].should.have.property('limit', 10);
-                apiTagStub.firstCall.args[0].should.have.property('slug', 'testing');
-                done();
-            }).catch(done);
-        });
-    });
-
-    describe('valid postsPerPage', function () {
-        it('Adds limit & includes to options by default', function (done) {
-            fetchData({}).then(function () {
-                apiPostsStub.calledOnce.should.be.true();
-                apiPostsStub.firstCall.args[0].should.be.an.Object();
-                apiPostsStub.firstCall.args[0].should.have.property('include');
-                apiPostsStub.firstCall.args[0].should.have.property('limit', 10);
-                done();
-            }).catch(done);
-        });
-    });
-
-    describe('invalid postsPerPage', function () {
-        beforeEach(function () {
-            themeConfigStub.withArgs('posts_per_page').returns(-1);
-        });
-
-        it('Will not add limit if postsPerPage is not valid', function (done) {
-            fetchData({}).then(function () {
-                apiPostsStub.calledOnce.should.be.true();
-                apiPostsStub.firstCall.args[0].should.be.an.Object();
-                apiPostsStub.firstCall.args[0].should.have.property('include');
-                apiPostsStub.firstCall.args[0].should.not.have.property('limit');
-
-                done();
-            }).catch(done);
-        });
-    });
-});
diff --git a/core/test/unit/controllers/frontend/post-lookup_spec.js b/core/test/unit/controllers/frontend/post-lookup_spec.js
deleted file mode 100644
index c8af8d67a5..0000000000
--- a/core/test/unit/controllers/frontend/post-lookup_spec.js
+++ /dev/null
@@ -1,256 +0,0 @@
-var should = require('should'),
-    sinon = require('sinon'),
-    Promise = require('bluebird'),
-    configUtils = require('../../../utils/configUtils'),
-    api = require('../../../../server/api'),
-    postLookup = require('../../../../server/controllers/frontend/post-lookup'),
-    settingsCache = require('../../../../server/services/settings/cache'),
-    sandbox = sinon.sandbox.create();
-
-describe('postLookup', function () {
-    var postAPIStub, localSettingsCache = {};
-
-    afterEach(function () {
-        sandbox.restore();
-        configUtils.restore();
-        localSettingsCache = {};
-    });
-
-    beforeEach(function () {
-        postAPIStub = sandbox.stub(api.posts, 'read');
-
-        sandbox.stub(settingsCache, 'get').callsFake(function (key) {
-            return localSettingsCache[key];
-        });
-    });
-
-    describe('Permalinks: /:slug/', function () {
-        beforeEach(function () {
-            localSettingsCache.permalinks = '/:slug/';
-
-            postAPIStub.withArgs({slug: 'welcome-to-ghost', include: 'author,authors,tags'})
-                .returns(new Promise.resolve({
-                    posts: [{
-                        url: '/welcome-to-ghost/',
-                        published_at: new Date('2016-01-01').valueOf()
-                    }]
-                }));
-        });
-
-        it('can lookup absolute url: /:slug/', function (done) {
-            var testUrl = 'http://127.0.0.1:2369/welcome-to-ghost/';
-
-            postLookup(testUrl).then(function (lookup) {
-                postAPIStub.calledOnce.should.be.true();
-                should.exist(lookup.post);
-                lookup.post.should.have.property('url', '/welcome-to-ghost/');
-                lookup.isEditURL.should.be.false();
-
-                done();
-            }).catch(done);
-        });
-
-        it('can lookup relative url: /:slug/', function (done) {
-            var testUrl = '/welcome-to-ghost/';
-
-            postLookup(testUrl).then(function (lookup) {
-                postAPIStub.calledOnce.should.be.true();
-                should.exist(lookup.post);
-                lookup.post.should.have.property('url', '/welcome-to-ghost/');
-                lookup.isEditURL.should.be.false();
-
-                done();
-            }).catch(done);
-        });
-
-        it('cannot lookup absolute url: /:year/:month/:day/:slug/', function (done) {
-            var testUrl = 'http://127.0.0.1:2369/2016/01/01/welcome-to-ghost/';
-
-            postLookup(testUrl).then(function (lookup) {
-                should.not.exist(lookup);
-                done();
-            }).catch(done);
-        });
-
-        it('cannot lookup relative url: /:year/:month/:day/:slug/', function (done) {
-            var testUrl = '/2016/01/01/welcome-to-ghost/';
-
-            postLookup(testUrl).then(function (lookup) {
-                should.not.exist(lookup);
-                done();
-            }).catch(done);
-        });
-    });
-
-    describe('Permalinks: /:year/:month/:day/:slug/', function () {
-        beforeEach(function () {
-            localSettingsCache.permalinks = '/:year/:month/:day/:slug/';
-
-            postAPIStub.withArgs({slug: 'welcome-to-ghost', include: 'author,authors,tags'})
-                .returns(new Promise.resolve({
-                    posts: [{
-                        url: '/2016/01/01/welcome-to-ghost/',
-                        published_at: new Date('2016-01-01').valueOf()
-                    }]
-                }));
-        });
-
-        it('cannot lookup absolute url: /:slug/', function (done) {
-            var testUrl = 'http://127.0.0.1:2369/welcome-to-ghost/';
-
-            postLookup(testUrl).then(function (lookup) {
-                should.not.exist(lookup);
-                done();
-            }).catch(done);
-        });
-
-        it('cannot lookup relative url: /:slug/', function (done) {
-            var testUrl = '/welcome-to-ghost/';
-
-            postLookup(testUrl).then(function (lookup) {
-                should.not.exist(lookup);
-                done();
-            }).catch(done);
-        });
-
-        it('can lookup absolute url: /:year/:month/:day/:slug/', function (done) {
-            var testUrl = 'http://127.0.0.1:2369/2016/01/01/welcome-to-ghost/';
-
-            postLookup(testUrl).then(function (lookup) {
-                postAPIStub.calledOnce.should.be.true();
-                should.exist(lookup.post);
-                lookup.post.should.have.property('url', '/2016/01/01/welcome-to-ghost/');
-                lookup.isEditURL.should.be.false();
-
-                done();
-            }).catch(done);
-        });
-
-        it('can lookup relative url: /:year/:month/:day/:slug/', function (done) {
-            var testUrl = '/2016/01/01/welcome-to-ghost/';
-
-            postLookup(testUrl).then(function (lookup) {
-                postAPIStub.calledOnce.should.be.true();
-                should.exist(lookup.post);
-                lookup.post.should.have.property('url', '/2016/01/01/welcome-to-ghost/');
-                lookup.isEditURL.should.be.false();
-
-                done();
-            }).catch(done);
-        });
-    });
-
-    describe('Edit URLs', function () {
-        beforeEach(function () {
-            localSettingsCache.permalinks = '/:slug/';
-
-            postAPIStub.withArgs({slug: 'welcome-to-ghost', include: 'author,authors,tags'})
-                .returns(new Promise.resolve({
-                    posts: [{
-                        url: '/welcome-to-ghost/',
-                        published_at: new Date('2016-01-01').valueOf()
-                    }]
-                }));
-        });
-
-        it('can lookup absolute url: /:slug/edit/', function (done) {
-            var testUrl = 'http://127.0.0.1:2369/welcome-to-ghost/edit/';
-
-            postLookup(testUrl).then(function (lookup) {
-                lookup.post.should.have.property('url', '/welcome-to-ghost/');
-                lookup.isEditURL.should.be.true();
-                done();
-            }).catch(done);
-        });
-
-        it('can lookup relative url: /:slug/edit/', function (done) {
-            var testUrl = '/welcome-to-ghost/edit/';
-
-            postLookup(testUrl).then(function (lookup) {
-                lookup.post.should.have.property('url', '/welcome-to-ghost/');
-                lookup.isEditURL.should.be.true();
-                done();
-            }).catch(done);
-        });
-
-        it('cannot lookup absolute url: /:year/:month/:day/:slug/edit/', function (done) {
-            var testUrl = 'http://127.0.0.1:2369/2016/01/01/welcome-to-ghost/edit/';
-
-            postLookup(testUrl).then(function (lookup) {
-                should.not.exist(lookup);
-                done();
-            }).catch(done);
-        });
-
-        it('cannot lookup relative url: /:year/:month/:day/:slug/edit/', function (done) {
-            var testUrl = '/2016/01/01/welcome-to-ghost/edit/';
-
-            postLookup(testUrl).then(function (lookup) {
-                should.not.exist(lookup);
-                done();
-            }).catch(done);
-        });
-
-        it('cannot lookup relative url: /:slug/notedit/', function (done) {
-            var testUrl = '/welcome-to-ghost/notedit/';
-
-            postLookup(testUrl).then(function (lookup) {
-                lookup.post.should.have.property('url', '/welcome-to-ghost/');
-                lookup.isUnknownOption.should.eql(true);
-                done();
-            }).catch(done);
-        });
-    });
-
-    describe('AMP URLs', function () {
-        beforeEach(function () {
-            localSettingsCache.permalinks = '/:slug/';
-
-            postAPIStub.withArgs({slug: 'welcome-to-ghost', include: 'author,authors,tags'})
-                .returns(new Promise.resolve({
-                    posts: [{
-                        url: '/welcome-to-ghost/',
-                        published_at: new Date('2016-01-01').valueOf()
-                    }]
-                }));
-        });
-
-        it('can lookup absolute url: /:slug/amp/', function (done) {
-            var testUrl = 'http://127.0.0.1:2369/welcome-to-ghost/amp/';
-
-            postLookup(testUrl).then(function (lookup) {
-                lookup.post.should.have.property('url', '/welcome-to-ghost/');
-                lookup.isEditURL.should.be.false();
-                done();
-            }).catch(done);
-        });
-
-        it('can lookup relative url: /:slug/amp/', function (done) {
-            var testUrl = '/welcome-to-ghost/amp/';
-
-            postLookup(testUrl).then(function (lookup) {
-                lookup.post.should.have.property('url', '/welcome-to-ghost/');
-                lookup.isEditURL.should.be.false();
-                done();
-            }).catch(done);
-        });
-
-        it('cannot lookup absolute url: /:year/:month/:day/:slug/amp/', function (done) {
-            var testUrl = 'http://127.0.0.1:2369/2016/01/01/welcome-to-ghost/amp/';
-
-            postLookup(testUrl).then(function (lookup) {
-                should.not.exist(lookup);
-                done();
-            }).catch(done);
-        });
-
-        it('cannot lookup relative url: /:year/:month/:day/:slug/amp/', function (done) {
-            var testUrl = '/2016/01/01/welcome-to-ghost/amp/';
-
-            postLookup(testUrl).then(function (lookup) {
-                should.not.exist(lookup);
-                done();
-            }).catch(done);
-        });
-    });
-});
diff --git a/core/test/unit/controllers/preview_spec.js b/core/test/unit/controllers/preview_spec.js
deleted file mode 100644
index 6bf7385efd..0000000000
--- a/core/test/unit/controllers/preview_spec.js
+++ /dev/null
@@ -1,202 +0,0 @@
-var should = require('should'),
-    sinon = require('sinon'),
-    Promise = require('bluebird'),
-    _ = require('lodash'),
-
-    // Test utils
-    configUtils = require('../../utils/configUtils'),
-    markdownToMobiledoc = require('../../utils/fixtures/data-generator').markdownToMobiledoc,
-
-    // Server requires
-    api = require('../../../server/api'),
-    controllers = require('../../../server/controllers'),
-    themes = require('../../../server/services/themes'),
-
-    sandbox = sinon.sandbox.create();
-
-describe('Controllers', function () {
-    var hasTemplateStub;
-
-    afterEach(function () {
-        sandbox.restore();
-        configUtils.restore();
-    });
-
-    // Ensure hasTemplate returns values
-    function setupActiveTheme() {
-        hasTemplateStub = sandbox.stub().returns(false);
-        hasTemplateStub.withArgs('post').returns(true);
-        hasTemplateStub.withArgs('page').returns(true);
-
-        sandbox.stub(themes, 'getActive').returns({
-            hasTemplate: hasTemplateStub
-        });
-    }
-
-    beforeEach(function () {
-        setupActiveTheme();
-    });
-
-    // Helper function to prevent unit tests
-    // from failing via timeout when they
-    // should just immediately fail
-    function failTest(done) {
-        return function (err) {
-            done(err);
-        };
-    }
-
-    describe('preview', function () {
-        var req, res, mockPosts = [{
-            posts: [{
-                status: 'draft',
-                uuid: 'abc-1234-01',
-                id: 1,
-                title: 'Test static page',
-                slug: 'test-static-page',
-                mobiledoc: markdownToMobiledoc('Test static page content'),
-                page: 1,
-                author: {
-                    id: 1,
-                    name: 'Test User',
-                    slug: 'test',
-                    email: 'test@ghost.org'
-                },
-                url: '/test-static-page/'
-            }]
-        }, {
-            posts: [{
-                status: 'draft',
-                uuid: 'abc-1234-02',
-                id: 2,
-                title: 'Test normal post',
-                slug: 'test-normal-post',
-                mobiledoc: markdownToMobiledoc('The test normal post content'),
-                page: 0,
-                author: {
-                    id: 1,
-                    name: 'Test User',
-                    slug: 'test',
-                    email: 'test@ghost.org'
-                }
-            }]
-        }, {
-            posts: [{
-                status: 'published',
-                uuid: 'abc-1234-03',
-                id: 3,
-                title: 'Getting started',
-                slug: 'about',
-                mobiledoc: markdownToMobiledoc('This is a blog post'),
-                page: 0,
-                published_at: new Date('2014/1/30').getTime(),
-                author: {
-                    id: 1,
-                    name: 'Test User',
-                    slug: 'test',
-                    email: 'test@ghost.org'
-                },
-                url: '/getting-started/'
-            }]
-        }];
-
-        beforeEach(function () {
-            sandbox.stub(api.posts, 'read').callsFake(function (args) {
-                var post = _.find(mockPosts, function (mock) {
-                    return mock.posts[0].uuid === args.uuid;
-                });
-                return Promise.resolve(post || {posts: []});
-            });
-
-            req = {
-                path: '/', params: {}, route: {}
-            };
-
-            res = {
-                locals: {},
-                render: sinon.spy(),
-                redirect: sinon.spy(),
-                set: sinon.spy()
-            };
-        });
-
-        it('should render draft post', function (done) {
-            req.params = {uuid: 'abc-1234-02'};
-            res.render = function (view, context) {
-                view.should.equal('post');
-                should.exist(context.post);
-                context.post.should.equal(mockPosts[1].posts[0]);
-
-                done();
-            };
-
-            controllers.preview(req, res, failTest(done));
-        });
-
-        it('should render draft page', function (done) {
-            req.params = {uuid: 'abc-1234-01'};
-            res.render = function (view, context) {
-                view.should.equal('page');
-                should.exist(context.post);
-                context.post.should.equal(mockPosts[0].posts[0]);
-
-                done();
-            };
-
-            controllers.preview(req, res, failTest(done));
-        });
-
-        it('should call next if post is not found', function (done) {
-            req.params = {uuid: 'abc-1234-04'};
-
-            controllers.preview(req, res, function (err) {
-                should.not.exist(err);
-                res.render.called.should.be.false();
-                res.redirect.called.should.be.false();
-                res.set.called.should.be.false();
-
-                done();
-            });
-        });
-
-        it('should call redirect if post is published', function (done) {
-            req.params = {uuid: 'abc-1234-03'};
-            res.redirect = function (status, url) {
-                res.render.called.should.be.false();
-                res.set.called.should.be.true();
-                status.should.eql(301);
-                url.should.eql('/getting-started/');
-
-                done();
-            };
-
-            controllers.preview(req, res, failTest(done));
-        });
-
-        it('should call redirect if /edit/ (options param) is detected', function (done) {
-            req.params = {uuid: 'abc-1234-01', options: 'edit'};
-            res.redirect = function (url) {
-                res.render.called.should.be.false();
-                res.set.called.should.be.false();
-                url.should.eql('/ghost/editor/1/');
-
-                done();
-            };
-
-            controllers.preview(req, res, failTest(done));
-        });
-
-        it('should call next for unknown options param detected', function (done) {
-            req.params = {uuid: 'abc-1234-01', options: 'asdsad'};
-
-            controllers.preview(req, res, function (err) {
-                should.not.exist(err);
-                res.render.called.should.be.false();
-                res.redirect.called.should.be.false();
-                res.set.called.should.be.false();
-
-                done();
-            });
-        });
-    });
-});
diff --git a/core/test/unit/controllers/rss_spec.js b/core/test/unit/controllers/rss_spec.js
deleted file mode 100644
index e4d8a96c67..0000000000
--- a/core/test/unit/controllers/rss_spec.js
+++ /dev/null
@@ -1,291 +0,0 @@
-var should = require('should'),
-    sinon = require('sinon'),
-    rewire = require('rewire'),
-    _ = require('lodash'),
-    Promise = require('bluebird'),
-    channelUtils = require('../../utils/channelUtils'),
-    settingsCache = require('../../../server/services/settings/cache'),
-    rssController = rewire('../../../server/controllers/rss'),
-    rssService = require('../../../server/services/rss'),
-
-    sandbox = sinon.sandbox.create();
-
-// Helper function to prevent unit tests
-// from failing via timeout when they
-// should just immediately fail
-function failTest(done) {
-    return function (err) {
-        done(err);
-    };
-}
-
-describe('RSS', function () {
-    describe('RSS: Controller only', function () {
-        var req, res, next, getDataStub, fakeData, resetGetData, rssServiceStub;
-
-        beforeEach(function () {
-            // Minimum setup of req and res
-            req = {
-                params: {},
-                originalUrl: '/rss/'
-            };
-
-            res = {
-                locals: {
-                    safeVersion: '0.6',
-                    channel: {postOptions: {}}
-                }
-            };
-
-            next = sandbox.stub();
-
-            // Overwrite getData
-            fakeData = {meta: {pagination: {pages: 3}}};
-            getDataStub = sandbox.stub().returns(Promise.resolve(fakeData));
-
-            resetGetData = rssController.__set__('getData', getDataStub);
-
-            rssServiceStub = sandbox.stub(rssService, 'render').returns(Promise.resolve());
-        });
-
-        afterEach(function () {
-            sandbox.restore();
-            resetGetData();
-        });
-
-        it('should fetch data and attempt to send XML', function (done) {
-            rssController(req, res, next)
-                .then(function () {
-                    next.called.should.be.false();
-
-                    getDataStub.calledOnce.should.be.true();
-                    getDataStub.calledWith(res.locals.channel).should.be.true();
-
-                    rssServiceStub.calledOnce.should.be.true();
-                    rssServiceStub.firstCall.args[0].should.eql(res);
-                    rssServiceStub.firstCall.args[1].should.eql('/rss/');
-                    rssServiceStub.firstCall.args[2].should.match(fakeData);
-                    done();
-                })
-                .catch(done);
-        });
-
-        it('can handle paginated urls', function (done) {
-            req.originalUrl = '/rss/2/';
-            req.params.page = 2;
-
-            rssController(req, res, next)
-                .then(function () {
-                    next.called.should.be.false();
-
-                    getDataStub.calledOnce.should.be.true();
-                    getDataStub.calledWith(res.locals.channel).should.be.true();
-
-                    rssServiceStub.calledOnce.should.be.true();
-                    rssServiceStub.firstCall.args[0].should.eql(res);
-                    rssServiceStub.firstCall.args[1].should.eql('/rss/');
-                    rssServiceStub.firstCall.args[2].should.match(fakeData);
-                    done();
-                })
-                .catch(done);
-        });
-
-        it('can handle paginated urls with subdirectories', function (done) {
-            req.originalUrl = '/blog/rss/2/';
-            req.params.page = 2;
-
-            rssController(req, res, next)
-                .then(function () {
-                    next.called.should.be.false();
-
-                    getDataStub.calledOnce.should.be.true();
-                    getDataStub.calledWith(res.locals.channel).should.be.true();
-
-                    rssServiceStub.calledOnce.should.be.true();
-                    rssServiceStub.firstCall.args[0].should.eql(res);
-                    rssServiceStub.firstCall.args[1].should.eql('/blog/rss/');
-                    rssServiceStub.firstCall.args[2].should.match(fakeData);
-                    done();
-                })
-                .catch(done);
-        });
-
-        it('can handle paginated urls for channels', function (done) {
-            req.originalUrl = '/tags/test/rss/2/';
-            req.params.page = 2;
-            req.params.slug = 'test';
-
-            rssController(req, res, next)
-                .then(function () {
-                    next.called.should.be.false();
-
-                    getDataStub.calledOnce.should.be.true();
-                    getDataStub.calledWith(res.locals.channel).should.be.true();
-
-                    rssServiceStub.calledOnce.should.be.true();
-                    rssServiceStub.firstCall.args[0].should.eql(res);
-                    rssServiceStub.firstCall.args[1].should.eql('/tags/test/rss/');
-                    rssServiceStub.firstCall.args[2].should.match(fakeData);
-                    done();
-                })
-                .catch(done);
-        });
-
-        it('should call next with 404 if page number too big', function (done) {
-            req.originalUrl = '/rss/4/';
-            req.params.page = 4;
-
-            rssController(req, res, next)
-                .then(function () {
-                    next.called.should.be.true();
-                    next.firstCall.args[0].statusCode.should.eql(404);
-
-                    getDataStub.calledOnce.should.be.true();
-                    getDataStub.calledWith(res.locals.channel).should.be.true();
-
-                    rssServiceStub.called.should.be.false();
-                    done();
-                })
-                .catch(done);
-        });
-    });
-
-    // These tests check the RSS feed from controller to result
-    // @TODO: test only the data generation, once we've refactored to make that easier
-    describe('RSS: getData / getTitle', function () {
-        var fetchDataStub, resetFetchData, getData;
-
-        beforeEach(function () {
-            fetchDataStub = sandbox.stub();
-            resetFetchData = rssController.__set__('fetchData', fetchDataStub);
-            getData = rssController.__get__('getData');
-
-            sandbox.stub(settingsCache, 'get').callsFake(function (key) {
-                var obj = {
-                    title: 'Test',
-                    description: 'Some Text'
-                };
-
-                return obj[key];
-            });
-        });
-
-        afterEach(function () {
-            sandbox.restore();
-            resetFetchData();
-        });
-
-        it('should process the data correctly for the index feed', function (done) {
-            fetchDataStub.returns(new Promise.resolve({posts: [{test: 'hey'}], meta: {foo: 'you'}}));
-
-            var channel = channelUtils.getTestChannel('index');
-
-            getData(channel)
-                .then(function (result) {
-                    fetchDataStub.calledOnce.should.be.true();
-                    fetchDataStub.calledWith(channel).should.be.true();
-
-                    result.should.eql({
-                        title: 'Test',
-                        description: 'Some Text',
-                        posts: [{test: 'hey'}],
-                        meta: {foo: 'you'}
-                    });
-                    done();
-                })
-                .catch(done);
-        });
-
-        it('should process the data correctly for a tag feed', function (done) {
-            fetchDataStub.returns(new Promise.resolve({posts: [{test: 'hey'}], meta: {foo: 'you'}}));
-
-            var channel = channelUtils.getTestChannel('tag');
-
-            getData(channel)
-                .then(function (result) {
-                    fetchDataStub.calledOnce.should.be.true();
-                    fetchDataStub.calledWith(channel).should.be.true();
-
-                    result.should.eql({
-                        title: 'Test',
-                        description: 'Some Text',
-                        posts: [{test: 'hey'}],
-                        meta: {foo: 'you'}
-                    });
-                    done();
-                })
-                .catch(done);
-        });
-
-        it('should process the data correctly for a tag feed WITH related data', function (done) {
-            fetchDataStub.returns(new Promise.resolve({
-                posts: [{test: 'hey'}],
-                meta: {foo: 'you'},
-                data: {tag: [{name: 'there'}]}
-            }));
-
-            var channel = channelUtils.getTestChannel('tag');
-
-            getData(channel)
-                .then(function (result) {
-                    fetchDataStub.calledOnce.should.be.true();
-                    fetchDataStub.calledWith(channel).should.be.true();
-
-                    result.should.eql({
-                        title: 'there - Test',
-                        description: 'Some Text',
-                        posts: [{test: 'hey'}],
-                        meta: {foo: 'you'}
-                    });
-                    done();
-                })
-                .catch(done);
-        });
-
-        it('should process the data correctly for an author feed', function (done) {
-            fetchDataStub.returns(new Promise.resolve({posts: [{test: 'hey'}], meta: {foo: 'you'}}));
-
-            var channel = channelUtils.getTestChannel('author');
-
-            getData(channel)
-                .then(function (result) {
-                    fetchDataStub.calledOnce.should.be.true();
-                    fetchDataStub.calledWith(channel).should.be.true();
-
-                    result.should.eql({
-                        title: 'Test',
-                        description: 'Some Text',
-                        posts: [{test: 'hey'}],
-                        meta: {foo: 'you'}
-                    });
-                    done();
-                })
-                .catch(done);
-        });
-
-        it('should process the data correctly for an author feed WITH related data', function (done) {
-            fetchDataStub.returns(new Promise.resolve({
-                posts: [{test: 'hey'}],
-                meta: {foo: 'you'},
-                data: {author: [{name: 'there'}]}
-            }));
-
-            var channel = channelUtils.getTestChannel('author');
-
-            getData(channel)
-                .then(function (result) {
-                    fetchDataStub.calledOnce.should.be.true();
-                    fetchDataStub.calledWith(channel).should.be.true();
-
-                    result.should.eql({
-                        title: 'there - Test',
-                        description: 'Some Text',
-                        posts: [{test: 'hey'}],
-                        meta: {foo: 'you'}
-                    });
-                    done();
-                })
-                .catch(done);
-        });
-    });
-});
diff --git a/core/test/unit/data/meta/amp_url_spec.js b/core/test/unit/data/meta/amp_url_spec.js
index 66d4393bbf..4295bdbd8b 100644
--- a/core/test/unit/data/meta/amp_url_spec.js
+++ b/core/test/unit/data/meta/amp_url_spec.js
@@ -1,83 +1,81 @@
-var should = require('should'),
-    getAmpUrl = require('../../../../server/data/meta/amp_url'),
-    markdownToMobiledoc = require('../../../utils/fixtures/data-generator').markdownToMobiledoc;
+const should = require('should'),
+    sinon = require('sinon'),
+    rewire = require('rewire'),
+    sandbox = sinon.sandbox.create(),
+    urlService = require('../../../../server/services/url'),
+    testUtils = require('../../../utils');
+
+let getAmpUrl = rewire('../../../../server/data/meta/amp_url');
 
 describe('getAmpUrl', function () {
-    it('should return amp url for post only', function () {
-        var ampUrl = getAmpUrl({
-            url: '/this-is-a-test-post/',
-            html: '<h1>Test 123</h1>',
-            markdown: markdownToMobiledoc('# Test 123'),
-            title: 'This is a test post',
-            slug: 'this-is-a-test-post',
-            secure: true,
-            context: ['post']
-        });
+    let getUrlStub;
 
-        ampUrl.should.not.equal('/this-is-a-test-post/');
-        ampUrl.should.match(/\/this-is-a-test-post\/amp\/$/);
-        ampUrl.should.not.match(/^https:/);
+    beforeEach(function () {
+        getUrlStub = sandbox.stub();
+
+        getAmpUrl = rewire('../../../../server/data/meta/amp_url');
+        getAmpUrl.__set__('getUrl', getUrlStub);
+
+        sandbox.stub(urlService.utils, 'urlJoin');
+        sandbox.stub(urlService.utils, 'urlFor').withArgs('home', true).returns('http://localhost:9999');
+    });
+
+    afterEach(function () {
+       sandbox.restore();
+    });
+
+    it('should return amp url for post', function () {
+        const post = testUtils.DataGenerator.forKnex.createPost();
+
+        // @TODO: WTF?
+        post.context = ['post'];
+
+        getUrlStub.withArgs(post, false).returns('url');
+        urlService.utils.urlJoin.withArgs('http://localhost:9999', 'url', 'amp/').returns('url');
+
+        should.exist(getAmpUrl(post));
+
+        urlService.utils.urlJoin.calledOnce.should.be.true();
+        urlService.utils.urlFor.calledOnce.should.be.true();
+        getUrlStub.calledOnce.should.be.true();
     });
 
     it('should not return amp url for tag', function () {
-        var ampUrl = getAmpUrl({
-            parent: null,
-            name: 'testing',
-            slug: 'testing',
-            description: 'We need testing',
-            secure: true,
-            context: ['tag']
-        });
+        const tag = testUtils.DataGenerator.forKnex.createTag();
 
-        should.not.exist(ampUrl);
+        // @TODO: WTF?
+        tag.context = ['tag'];
+
+        should.not.exist(getAmpUrl(tag));
+
+        urlService.utils.urlJoin.called.should.be.false();
+        urlService.utils.urlFor.called.should.be.false();
+        getUrlStub.called.should.be.false();
     });
 
     it('should not return amp url for author', function () {
-        var ampUrl = getAmpUrl({
-            name: 'Test User',
-            bio: 'This is all about testing',
-            website: 'http://my-testing-site.com',
-            status: 'testing',
-            location: 'Wounderland',
-            slug: 'test-user',
-            secure: true,
-            context: ['author']
-        });
-        should.not.exist(ampUrl);
+        const author = testUtils.DataGenerator.forKnex.createUser();
+
+        // @TODO: WTF?
+        author.context = ['author'];
+
+        should.not.exist(getAmpUrl(author));
+
+        urlService.utils.urlJoin.called.should.be.false();
+        urlService.utils.urlFor.called.should.be.false();
+        getUrlStub.called.should.be.false();
     });
 
     it('should not return amp url for amp post', function () {
-        var ampUrl = getAmpUrl({
-            name: 'Test User',
-            bio: 'This is all about testing',
-            website: 'http://my-testing-site.com',
-            status: 'testing',
-            location: 'Wounderland',
-            slug: 'test-user',
-            secure: true,
-            context: ['amp', 'post']
-        });
-        should.not.exist(ampUrl);
-    });
+        const post = testUtils.DataGenerator.forKnex.createPost();
 
-    it('should not return amp url for amp page', function () {
-        var ampUrl = getAmpUrl({
-            name: 'Test User',
-            bio: 'This is all about testing',
-            website: 'http://my-testing-site.com',
-            status: 'testing',
-            location: 'Wounderland',
-            slug: 'test-user',
-            secure: true,
-            context: ['amp', 'page']
-        });
-        should.not.exist(ampUrl);
-    });
+        // @TODO: WTF?
+        post.context = ['amp', 'post'];
 
-    it('should return home if empty secure data', function () {
-        var ampUrl = getAmpUrl({
-            secure: true
-        });
-        should.not.exist(ampUrl);
+        should.not.exist(getAmpUrl(post));
+
+        urlService.utils.urlJoin.called.should.be.false();
+        urlService.utils.urlFor.called.should.be.false();
+        getUrlStub.called.should.be.false();
     });
 });
diff --git a/core/test/unit/data/meta/author_url_spec.js b/core/test/unit/data/meta/author_url_spec.js
index 6d111e9360..09be77e397 100644
--- a/core/test/unit/data/meta/author_url_spec.js
+++ b/core/test/unit/data/meta/author_url_spec.js
@@ -1,85 +1,85 @@
-var should = require('should'),
+const should = require('should'),
+    sinon = require('sinon'),
+    ObjectId = require('bson-objectid'),
+    sandbox = sinon.sandbox.create(),
+    urlService = require('../../../../server/services/url'),
     getAuthorUrl = require('../../../../server/data/meta/author_url');
 
 describe('getAuthorUrl', function () {
-    it('should return author url if context contains author',
-        function () {
-            var authorUrl = getAuthorUrl({
-                context: ['post'],
-                post: {
-                    primary_author: {
-                        slug: 'test-author'
-                    }
-                }
-            });
-            authorUrl.should.equal('/author/test-author/');
-        });
+    beforeEach(function () {
+        sandbox.stub(urlService, 'getUrlByResourceId');
+    });
 
-    it('should return absolute author url if context contains author',
-        function () {
-            var authorUrl = getAuthorUrl({
-                context: ['post'],
-                post: {
-                    primary_author: {
-                        slug: 'test-author'
-                    }
-                }
-            }, true);
-            authorUrl.should.not.equal('/author/test-author/');
-            authorUrl.should.match(/\/author\/test-author\/$/);
-        });
+    afterEach(function () {
+        sandbox.restore();
+    });
 
-    it('should return author url for AMP if context contains author',
-        function () {
-            var authorUrl = getAuthorUrl({
-                context: ['amp', 'post'],
-                post: {
-                    primary_author: {
-                        slug: 'test-author'
-                    }
-                }
-            });
-            authorUrl.should.equal('/author/test-author/');
-        });
+    it('should return author url if context contains primary author', function () {
+        const post = {
+            primary_author: {
+                id: ObjectId.generate(),
+                slug: 'test-author'
+            }
+        };
 
-    it('should return absolute author url for AMP if context contains author',
-        function () {
-            var authorUrl = getAuthorUrl({
-                context: ['amp', 'post'],
-                post: {
-                    primary_author: {
-                        slug: 'test-author'
-                    }
-                }
-            }, true);
-            authorUrl.should.not.equal('/author/test-author/');
-            authorUrl.should.match(/\/author\/test-author\/$/);
-        });
+        urlService.getUrlByResourceId.withArgs(post.primary_author.id, {absolute: undefined, secure: undefined})
+            .returns('author url');
 
-    it('should return author url if data contains author',
-        function () {
-            var authorUrl = getAuthorUrl({
-                author: {
-                    slug: 'test-author'
-                }
-            });
-            authorUrl.should.equal('/author/test-author/');
-        });
+        should.exist(getAuthorUrl({
+            context: ['post'],
+            post: post
+        }));
+    });
 
-    it('should return absolute author url if data contains author',
-        function () {
-            var authorUrl = getAuthorUrl({
-                author: {
-                    slug: 'test-author'
-                }
-            }, true);
-            authorUrl.should.not.equal('/author/test-author/');
-            authorUrl.should.match(/\/author\/test-author\/$/);
-        });
+    it('should return absolute author url if context contains primary author', function () {
+        const post = {
+            primary_author: {
+                id: ObjectId.generate(),
+                slug: 'test-author'
+            }
+        };
 
-    it('should return null if no author on data or context',
-        function () {
-            var authorUrl = getAuthorUrl({}, true);
-            should(authorUrl).equal(null);
-        });
+        urlService.getUrlByResourceId.withArgs(post.primary_author.id, {absolute: true, secure: undefined})
+            .returns('absolute author url');
+
+        should.exist(getAuthorUrl({
+            context: ['post'],
+            post: post
+        }, true));
+    });
+
+    it('should return author url for AMP if context contains primary author', function () {
+        const post = {
+            primary_author: {
+                id: ObjectId.generate(),
+                slug: 'test-author'
+            }
+        };
+
+        urlService.getUrlByResourceId.withArgs(post.primary_author.id, {absolute: undefined, secure: undefined})
+            .returns('author url');
+
+        should.exist(getAuthorUrl({
+            context: ['amp', 'post'],
+            post: post
+        }));
+    });
+
+    it('should return author url if data contains author', function () {
+        const author = {
+            id: ObjectId.generate(),
+            slug: 'test-author'
+        };
+
+        urlService.getUrlByResourceId.withArgs(author.id, {absolute: undefined, secure: undefined})
+            .returns('author url');
+
+        should.exist(getAuthorUrl({
+            author: author
+        }));
+    });
+
+    it('should return null if no author on data or context', function () {
+        should.not.exist(getAuthorUrl({}, true));
+    });
 });
diff --git a/core/test/unit/data/meta/canonical_url_spec.js b/core/test/unit/data/meta/canonical_url_spec.js
index f445d2afca..38308cafca 100644
--- a/core/test/unit/data/meta/canonical_url_spec.js
+++ b/core/test/unit/data/meta/canonical_url_spec.js
@@ -1,70 +1,63 @@
-var should = require('should'),
-    getCanonicalUrl = require('../../../../server/data/meta/canonical_url'),
-    markdownToMobiledoc = require('../../../utils/fixtures/data-generator').markdownToMobiledoc;
+const should = require('should'),
+    sinon = require('sinon'),
+    rewire = require('rewire'),
+    sandbox = sinon.sandbox.create(),
+    urlService = require('../../../../server/services/url'),
+    testUtils = require('../../../utils');
+
+let getCanonicalUrl = rewire('../../../../server/data/meta/canonical_url');
 
 describe('getCanonicalUrl', function () {
-    it('should return absolute canonical url for post', function () {
-        var canonicalUrl = getCanonicalUrl({
-            url: '/this-is-a-test-post/',
-            html: '<h1>Test 123</h1>',
-            mobiledoc: markdownToMobiledoc('# Test 123'),
-            title: 'This is a test post',
-            slug: 'this-is-a-test-post',
-            secure: true
-        });
-        canonicalUrl.should.not.equal('/this-is-a-test-post/');
-        canonicalUrl.should.match(/\/this-is-a-test-post\/$/);
-        canonicalUrl.should.not.match(/^https:/);
+    let getUrlStub;
+
+    beforeEach(function () {
+        getUrlStub = sandbox.stub();
+
+        getCanonicalUrl = rewire('../../../../server/data/meta/canonical_url');
+        getCanonicalUrl.__set__('getUrl', getUrlStub);
+
+        sandbox.stub(urlService.utils, 'urlJoin');
+        sandbox.stub(urlService.utils, 'urlFor').withArgs('home', true).returns('http://localhost:9999');
     });
 
-    it('should return absolute canonical url for amp post without /amp/ in url', function () {
-        var canonicalUrl = getCanonicalUrl({
-            url: '/this-is-a-test-post/amp/',
-            html: '<h1>Test 123</h1>',
-            mobiledoc: markdownToMobiledoc('# Test 123'),
-            title: 'This is a test post',
-            slug: 'this-is-a-test-post',
-            secure: true
-        });
-        canonicalUrl.should.not.equal('/this-is-a-test-post/amp/');
-        canonicalUrl.should.match(/\/this-is-a-test-post\/$/);
-        canonicalUrl.should.not.match(/^https:/);
+    afterEach(function () {
+        sandbox.restore();
     });
 
-    it('should return absolute canonical url for tag', function () {
-        var canonicalUrl = getCanonicalUrl({
-            parent: null,
-            name: 'testing',
-            slug: 'testing',
-            description: 'We need testing',
-            secure: true
-        });
-        canonicalUrl.should.not.equal('/tag/testing/');
-        canonicalUrl.should.match(/\/tag\/testing\/$/);
-        canonicalUrl.should.not.match(/^https:/);
+    it('should return canonical url', function () {
+        const post = testUtils.DataGenerator.forKnex.createPost();
+
+        getUrlStub.withArgs(post, false).returns('/post-url/');
+        urlService.utils.urlJoin.withArgs('http://localhost:9999', '/post-url/').returns('canonical url');
+
+        getCanonicalUrl(post).should.eql('canonical url');
+
+        urlService.utils.urlJoin.calledOnce.should.be.true();
+        urlService.utils.urlFor.calledOnce.should.be.true();
+        getUrlStub.calledOnce.should.be.true();
     });
 
-    it('should return absolute canonical url for author', function () {
-        var canonicalUrl = getCanonicalUrl({
-            name: 'Test User',
-            bio: 'This is all about testing',
-            website: 'http://my-testing-site.com',
-            profile_image: null,
-            location: 'Wounderland',
-            slug: 'test-user',
-            secure: true
-        });
-        canonicalUrl.should.not.equal('/author/test-user/');
-        canonicalUrl.should.match(/\/author\/test-user\/$/);
-        canonicalUrl.should.not.match(/^https:/);
+    it('should return canonical url for amp post without /amp/ in url', function () {
+        const post = testUtils.DataGenerator.forKnex.createPost();
+
+        getUrlStub.withArgs(post, false).returns('/post-url/amp/');
+        urlService.utils.urlJoin.withArgs('http://localhost:9999', '/post-url/amp/').returns('*/amp/');
+
+        getCanonicalUrl(post).should.eql('*/');
+
+        urlService.utils.urlJoin.calledOnce.should.be.true();
+        urlService.utils.urlFor.calledOnce.should.be.true();
+        getUrlStub.calledOnce.should.be.true();
     });
 
     it('should return home if empty secure data', function () {
-        var canonicalUrl = getCanonicalUrl({
-            secure: true
-        });
-        canonicalUrl.should.not.equal('/');
-        canonicalUrl.should.match(/\/$/);
-        canonicalUrl.should.not.match(/^https:/);
+        getUrlStub.withArgs({secure: true}, false).returns('/');
+        urlService.utils.urlJoin.withArgs('http://localhost:9999', '/').returns('canonical url');
+
+        getCanonicalUrl({secure: true}).should.eql('canonical url');
+
+        urlService.utils.urlJoin.calledOnce.should.be.true();
+        urlService.utils.urlFor.calledOnce.should.be.true();
+        getUrlStub.calledOnce.should.be.true();
     });
 });
diff --git a/core/test/unit/data/meta/paginated_url_spec.js b/core/test/unit/data/meta/paginated_url_spec.js
index 728d4f16eb..101d06cb0b 100644
--- a/core/test/unit/data/meta/paginated_url_spec.js
+++ b/core/test/unit/data/meta/paginated_url_spec.js
@@ -24,7 +24,7 @@ describe('getPaginatedUrl', function () {
     });
 
     describe('index', function () {
-        it('should calculate correct urls for the first page of the index channel', function () {
+        it('should calculate correct urls for the first page of an index collection', function () {
             // Setup tests
             data.relativeUrl = '/';
             data.pagination = {prev: null, next: 2};
@@ -40,7 +40,7 @@ describe('getPaginatedUrl', function () {
             urls.should.have.property('page10', '/page/10/');
         });
 
-        it('should calculate correct urls for the second page of the index channel', function () {
+        it('should calculate correct urls for the second page of an index collection', function () {
             // Setup tests
             data.relativeUrl = '/page/2/';
             data.pagination = {prev: 1, next: 3};
@@ -56,7 +56,7 @@ describe('getPaginatedUrl', function () {
             urls.should.have.property('page10', '/page/10/');
         });
 
-        it('should calculate correct urls for the last page of the index channel', function () {
+        it('should calculate correct urls for the last page of an index collection', function () {
             // Setup tests
             data.relativeUrl = '/page/10/';
             data.pagination = {prev: 9, next: null};
@@ -74,7 +74,7 @@ describe('getPaginatedUrl', function () {
     });
 
     describe('other', function () {
-        it('should calculate correct urls for the first page of another channel', function () {
+        it('should calculate correct urls for the first page of another collection', function () {
             // Setup tests
             data.relativeUrl = '/featured/';
             data.pagination = {prev: null, next: 2};
@@ -90,7 +90,7 @@ describe('getPaginatedUrl', function () {
             urls.should.have.property('page10', '/featured/page/10/');
         });
 
-        it('should calculate correct urls for the second page of another channel', function () {
+        it('should calculate correct urls for the second page of another collection', function () {
             // Setup tests
             data.relativeUrl = '/featured/page/2/';
             data.pagination = {prev: 1, next: 3};
@@ -106,7 +106,7 @@ describe('getPaginatedUrl', function () {
             urls.should.have.property('page10', '/featured/page/10/');
         });
 
-        it('should calculate correct urls for the last page of another channel', function () {
+        it('should calculate correct urls for the last page of another collection', function () {
             // Setup tests
             data.relativeUrl = '/featured/page/10/';
             data.pagination = {prev: 9, next: null};
@@ -148,7 +148,7 @@ describe('getPaginatedUrl', function () {
             urls.should.have.property('page10', '/blog/page/10/');
         });
 
-        it('should calculate correct urls for another channel', function () {
+        it('should calculate correct urls for another collection', function () {
             // Setup tests
             data.relativeUrl = '/featured/page/2/';
             data.pagination = {prev: 1, next: 3};
diff --git a/core/test/unit/data/meta/rss_url_spec.js b/core/test/unit/data/meta/rss_url_spec.js
index 56ce7788e9..c068a66563 100644
--- a/core/test/unit/data/meta/rss_url_spec.js
+++ b/core/test/unit/data/meta/rss_url_spec.js
@@ -1,25 +1,34 @@
-var should = require('should'),
+const should = require('should'),
+    sinon = require('sinon'),
+    sandbox = sinon.sandbox.create(),
+    routing = require('../../../../server/services/routing'),
     getRssUrl = require('../../../../server/data/meta/rss_url');
 
 describe('getRssUrl', function () {
+    let firstCollection;
+
+    beforeEach(function () {
+        sandbox.restore();
+
+        firstCollection = sandbox.stub();
+        firstCollection.getRssUrl = sandbox.stub().returns('/rss/');
+
+        sandbox.stub(routing.registry, 'getFirstCollectionRouter').returns(firstCollection);
+    });
+
     it('should return rss url', function () {
-        var rssUrl = getRssUrl({
+        const rssUrl = getRssUrl({
             secure: false
         });
+
         should.equal(rssUrl, '/rss/');
     });
 
-    it('should return absolute rss url', function () {
-        var rssUrl = getRssUrl({
+    it('forwards absolute/secure flags', function () {
+        const rssUrl = getRssUrl({
             secure: false
         }, true);
-        should.equal(rssUrl, 'http://127.0.0.1:2369/rss/');
-    });
 
-    it('should return absolute rss url with https if secure', function () {
-        var rssUrl = getRssUrl({
-            secure: true
-        }, true);
-        should.equal(rssUrl, 'https://127.0.0.1:2369/rss/');
+        firstCollection.getRssUrl.calledWith({secure: false, absolute: true}).should.be.true();
     });
 });
diff --git a/core/test/unit/data/meta/url_spec.js b/core/test/unit/data/meta/url_spec.js
index 01d21a261e..cfe3838809 100644
--- a/core/test/unit/data/meta/url_spec.js
+++ b/core/test/unit/data/meta/url_spec.js
@@ -1,133 +1,131 @@
-var should = require('should'),
+const should = require('should'),
+    sinon = require('sinon'),
+    sandbox = sinon.sandbox.create(),
+    urlService = require('../../../../server/services/url'),
     getUrl = require('../../../../server/data/meta/url'),
-    markdownToMobiledoc = require('../../../utils/fixtures/data-generator').markdownToMobiledoc;
+    testUtils = require('../../../utils/');
 
 describe('getUrl', function () {
+    beforeEach(function () {
+        sandbox.stub(urlService, 'getUrlByResourceId');
+        sandbox.stub(urlService.utils, 'urlFor');
+    });
+
+    afterEach(function () {
+        sandbox.restore();
+    });
+
     it('should return url for a post', function () {
-        var url = getUrl({
-            html: '<p>Welcome to my post.</p>',
-            mobiledoc: markdownToMobiledoc('Welcome to my post.'),
-            title: 'Welcome Post',
-            slug: 'welcome-post',
-            url: '/post/welcome-post/'
-        });
-        url.should.equal('/post/welcome-post/');
+        const post = testUtils.DataGenerator.forKnex.createPost();
+
+        urlService.getUrlByResourceId.withArgs(post.id, {absolute: undefined, secure: undefined})
+            .returns('post url');
+
+        getUrl(post).should.eql('post url');
     });
 
     it('should return absolute url for a post', function () {
-        var url = getUrl({
-            html: '<p>Welcome to my post.</p>',
-            mobiledoc: markdownToMobiledoc('Welcome to my post.'),
-            title: 'Welcome Post',
-            slug: 'welcome-post',
-            url: '/post/welcome-post/'
-        }, true);
-        url.should.equal('http://127.0.0.1:2369/post/welcome-post/');
-    });
+        const post = testUtils.DataGenerator.forKnex.createPost();
 
-    it('should return url for a post and remove /amp/ in url', function () {
-        var url = getUrl({
-            relativeUrl: '/welcome-post/amp/',
-            post: {
-                html: '<p>Welcome to my post.</p>',
-                title: 'Welcome Post',
-                slug: 'welcome-post',
-                url: '/welcome-post/amp/'
-            }
-        });
-        url.should.equal('/welcome-post/');
+        urlService.getUrlByResourceId.withArgs(post.id, {absolute: true, secure: undefined})
+            .returns('absolute post url');
+
+        getUrl(post, true).should.eql('absolute post url');
     });
 
     it('should return absolute url for a post and remove /amp/ in url', function () {
-        var url = getUrl({
-            relativeUrl: '/welcome-post/amp/',
-            post: {
-                html: '<p>Welcome to my post.</p>',
-                title: 'Welcome Post',
-                slug: 'welcome-post',
-                url: '/welcome-post/amp/'
-            }
-        }, true);
-        url.should.equal('http://127.0.0.1:2369/welcome-post/');
+        const data = {relativeUrl: '/*/amp/'};
+
+        urlService.utils.urlFor.withArgs(data, {}, true).returns('absolute/*/amp/');
+        getUrl(data, true).should.eql('absolute/*/');
+        urlService.getUrlByResourceId.called.should.be.false();
     });
 
     it('should return url for a tag', function () {
-        var url = getUrl({
-            name: 'Great',
-            slug: 'great',
-            description: 'My great tag',
-            parent: null
-        });
-        url.should.equal('/tag/great/');
+        const tag = testUtils.DataGenerator.forKnex.createTag();
+
+        // @NOTE: we currently have no way to generate a test model which is correctly jsonified
+        //        e.g. testUtils.DataGenerator.forModel.createTag().toJSON()
+        //        the tag object contains a `parent` attribute. the tag model contains a `parent_id` attr.
+        tag.parent = null;
+
+        urlService.getUrlByResourceId.withArgs(tag.id, {absolute: undefined, secure: undefined})
+            .returns('tag url');
+
+        getUrl(tag).should.eql('tag url');
     });
 
-    it('should return secure absolute url for a tag', function () {
-        var url = getUrl({
-            name: 'Great',
-            slug: 'great',
-            description: 'My great tag',
-            parent: null,
-            secure: true
-        }, true);
-        url.should.equal('https://127.0.0.1:2369/tag/great/');
+    it('should return secure url for a tag', function () {
+        const tag = testUtils.DataGenerator.forKnex.createTag();
+
+        // @NOTE: we currently have no way to generate a test model which is correctly jsonified
+        //        e.g. testUtils.DataGenerator.forModel.createTag().toJSON()
+        //        the tag object contains a `parent` attribute. the tag model contains a `parent_id` attr.
+        tag.parent = null;
+
+        // @TODO: WTF O_O
+        tag.secure = true;
+
+        urlService.getUrlByResourceId.withArgs(tag.id, {absolute: undefined, secure: true})
+            .returns('secure tag url');
+
+        getUrl(tag).should.eql('secure tag url');
     });
 
     it('should return url for a author', function () {
-        var url = getUrl({
-            name: 'Author Name',
-            bio: 'I am fun bio!',
-            website: 'http://myoksite.com',
-            profile_image: null,
-            location: 'London',
-            slug: 'author-name'
-        });
-        url.should.equal('/author/author-name/');
+        const author = testUtils.DataGenerator.forKnex.createUser();
+
+        urlService.getUrlByResourceId.withArgs(author.id, {absolute: undefined, secure: undefined})
+            .returns('author url');
+
+        getUrl(author).should.eql('author url');
     });
 
     it('should return secure absolute url for a author', function () {
-        var url = getUrl({
-            name: 'Author Name',
-            bio: 'I am fun bio!',
-            website: 'http://myoksite.com',
-            profile_image: null,
-            location: 'London',
-            slug: 'author-name',
-            secure: true
-        }, true);
-        url.should.equal('https://127.0.0.1:2369/author/author-name/');
+        const author = testUtils.DataGenerator.forKnex.createUser();
+
+        // @TODO: WTF
+        author.secure = true;
+
+        urlService.getUrlByResourceId.withArgs(author.id, {absolute: true, secure: true})
+            .returns('absolute secure author url');
+
+        getUrl(author, true).should.eql('absolute secure author url');
     });
 
     it('should return url for a nav', function () {
-        var url = getUrl({
+        const data = {
             label: 'About Me',
             url: '/about-me/',
             slug: 'about-me',
             current: true
-        });
-        url.should.equal('/about-me/');
+        };
+
+        urlService.utils.urlFor.withArgs('nav', {nav: data, secure: data.secure}, undefined)
+            .returns('nav url');
+
+        getUrl(data).should.equal('nav url');
     });
 
     it('should return absolute url for a nav', function () {
-        var url = getUrl({
+        const data = {
             label: 'About Me',
             url: '/about-me/',
             slug: 'about-me',
             current: true
-        }, true);
-        url.should.equal('http://127.0.0.1:2369/about-me/');
+        };
+
+        urlService.utils.urlFor.withArgs('nav', {nav: data, secure: data.secure}, true)
+            .returns('absolute nav url');
+
+        getUrl(data, true).should.equal('absolute nav url');
     });
 
-    it('should return url for a context object with relative url', function () {
-        var url = getUrl({
-            relativeUrl: '/my/relative/url/'
-        });
-        url.should.equal('/my/relative/url/');
-    });
+    it('should return `relativeUrl` and remove /amp/ in url', function () {
+        const data = {relativeUrl: '/*/amp/'};
 
-    it('should return url for a context object with relative url and remove /amp/ in url', function () {
-        var url = getUrl({
-            relativeUrl: '/my/relative/url/amp/'
-        });
-        url.should.equal('/my/relative/url/');
+        urlService.utils.urlFor.withArgs(data, {}, undefined).returns(data.relativeUrl);
+        getUrl(data).should.eql('/*/');
+        urlService.getUrlByResourceId.called.should.be.false();
     });
 });
diff --git a/core/test/unit/data/xml/sitemap/generator_spec.js b/core/test/unit/data/xml/sitemap/generator_spec.js
index daf8d0d720..95246c102e 100644
--- a/core/test/unit/data/xml/sitemap/generator_spec.js
+++ b/core/test/unit/data/xml/sitemap/generator_spec.js
@@ -1,24 +1,22 @@
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
-    Promise = require('bluebird'),
-    validator = require('validator'),
+    ObjectId = require('bson-objectid'),
     _ = require('lodash'),
-
-    // Stuff we are testing
-    api = require('../../../../../server/api'),
+    testUtils = require('../../../../utils'),
     urlService = require('../../../../../server/services/url'),
-    BaseGenerator = require('../../../../../server/data/xml/sitemap/base-generator'),
+    IndexGenerator = require('../../../../../server/data/xml/sitemap/index-generator'),
     PostGenerator = require('../../../../../server/data/xml/sitemap/post-generator'),
     PageGenerator = require('../../../../../server/data/xml/sitemap/page-generator'),
     TagGenerator = require('../../../../../server/data/xml/sitemap/tag-generator'),
     UserGenerator = require('../../../../../server/data/xml/sitemap/user-generator'),
-
     sandbox = sinon.sandbox.create();
 
 should.Assertion.add('ValidUrlNode', function (options) {
     // Check urlNode looks correct
-    var urlNode = this.obj,
-        flatNode;
+    /*eslint no-invalid-this: "off"*/
+    let urlNode = this.obj;
+    let flatNode;
+
     urlNode.should.be.an.Object().with.key('url');
     urlNode.url.should.be.an.Array();
 
@@ -51,80 +49,33 @@ should.Assertion.add('ValidUrlNode', function (options) {
 });
 
 describe('Generators', function () {
-    var stubUrl = function (generator) {
-            sandbox.stub(generator, 'getUrlForDatum').callsFake(function (datum) {
-                return 'http://my-ghost-blog.com/url/' + datum.id;
-            });
-            sandbox.stub(generator, 'getUrlForImage').callsFake(function (image) {
-                return 'http://my-ghost-blog.com/images/' + image;
-            });
-
-            return generator;
-        },
-        makeFakeDatum = function (id) {
-            return {
-                id: id,
-                created_at: (Date.UTC(2014, 11, 22, 12) - 360000) + id,
-                visibility: 'public'
-            };
-        },
-        generator;
+    let generator;
 
     afterEach(function () {
         sandbox.restore();
     });
 
-    describe('BaseGenerator', function () {
+    describe('IndexGenerator', function () {
         beforeEach(function () {
-            generator = new BaseGenerator();
-        });
-
-        it('can initialize with empty siteMapContent', function (done) {
-            generator.init().then(function () {
-                should.exist(generator.siteMapContent);
-
-                validator.contains(generator.siteMapContent, '<loc>').should.equal(false);
-
-                done();
-            }).catch(done);
-        });
-
-        it('can initialize with non-empty siteMapContent', function (done) {
-            stubUrl(generator);
-
-            sandbox.stub(generator, 'getData').callsFake(function () {
-                return Promise.resolve([
-                    makeFakeDatum(100),
-                    makeFakeDatum(200),
-                    makeFakeDatum(300)
-                ]);
+            generator = new IndexGenerator({
+                types: {
+                    posts: new PostGenerator(),
+                    pages: new PageGenerator(),
+                    tags: new TagGenerator(),
+                    authors: new UserGenerator()
+                }
             });
+        });
 
-            generator.init().then(function () {
-                var idxFirst,
-                    idxSecond,
-                    idxThird;
+        describe('fn: getXml', function () {
+            it('default', function () {
+                const xml = generator.getXml();
 
-                should.exist(generator.siteMapContent);
-
-                // TODO: We should validate the contents against the XSD:
-                // xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                // xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
-
-                generator.siteMapContent.should.containEql('<loc>http://my-ghost-blog.com/url/100</loc>');
-                generator.siteMapContent.should.containEql('<loc>http://my-ghost-blog.com/url/200</loc>');
-                generator.siteMapContent.should.containEql('<loc>http://my-ghost-blog.com/url/300</loc>');
-
-                // Validate order newest to oldest
-                idxFirst = generator.siteMapContent.indexOf('<loc>http://my-ghost-blog.com/url/300</loc>');
-                idxSecond = generator.siteMapContent.indexOf('<loc>http://my-ghost-blog.com/url/200</loc>');
-                idxThird = generator.siteMapContent.indexOf('<loc>http://my-ghost-blog.com/url/100</loc>');
-
-                idxFirst.should.be.below(idxSecond);
-                idxSecond.should.be.below(idxThird);
-
-                done();
-            }).catch(done);
+                xml.should.match(/sitemap-tags.xml/);
+                xml.should.match(/sitemap-posts.xml/);
+                xml.should.match(/sitemap-pages.xml/);
+                xml.should.match(/sitemap-authors.xml/);
+            });
         });
     });
 
@@ -133,93 +84,119 @@ describe('Generators', function () {
             generator = new PostGenerator();
         });
 
-        it('uses 0.9 priority for featured posts', function () {
-            generator.getPriorityForDatum({
-                featured: true
-            }).should.equal(0.9);
-        });
-
-        it('uses 0.8 priority for all other (non-featured) posts', function () {
-            generator.getPriorityForDatum({
-                featured: false
-            }).should.equal(0.8);
-        });
-
-        it('does not create a node for a post with visibility that is not public', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                visibility: 'private',
-                page: false
-            }));
-
-            urlNode.should.be.false();
-        });
-
-        it('does not create a node for a page', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                page: true
-            }));
-
-            urlNode.should.be.false();
-        });
-
-        it('adds an image:image element if post has a cover image', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                feature_image: 'post-100.jpg',
-                page: false
-            }));
-
-            urlNode.should.be.a.ValidUrlNode({withImage: true});
-        });
-
-        it('can initialize with non-empty siteMapContent', function (done) {
-            stubUrl(generator);
-
-            sandbox.stub(generator, 'getData').callsFake(function () {
-                return Promise.resolve([
-                    _.extend(makeFakeDatum(100), {
-                        feature_image: 'post-100.jpg',
-                        page: false
-                    }),
-                    _.extend(makeFakeDatum(200), {
-                        page: false
-                    }),
-                    _.extend(makeFakeDatum(300), {
-                        feature_image: 'post-300.jpg',
-                        page: false
-                    })
-                ]);
+        describe('fn: getPriorityForDatum', function () {
+            it('uses 0.9 priority for featured posts', function () {
+                generator.getPriorityForDatum({
+                    featured: true
+                }).should.equal(0.9);
             });
 
-            generator.init().then(function () {
-                var idxFirst,
-                    idxSecond,
-                    idxThird;
+            it('uses 0.8 priority for all other (non-featured) posts', function () {
+                generator.getPriorityForDatum({
+                    featured: false
+                }).should.equal(0.8);
+            });
+        });
 
-                should.exist(generator.siteMapContent);
+        describe('fn: createNodeFromDatum', function () {
+            it('adds an image:image element if post has a cover image', function () {
+                const urlNode = generator.createUrlNodeFromDatum('https://myblog.com/test/', testUtils.DataGenerator.forKnex.createPost({
+                    feature_image: 'post-100.jpg',
+                    page: false,
+                    slug: 'test'
+                }));
 
-                // TODO: We should validate the contents against the XSD:
-                // xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                // xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"
+                urlNode.should.be.a.ValidUrlNode({withImage: true});
+            });
+        });
 
-                generator.siteMapContent.should.containEql('<loc>http://my-ghost-blog.com/url/100</loc>');
-                generator.siteMapContent.should.containEql('<loc>http://my-ghost-blog.com/url/200</loc>');
-                generator.siteMapContent.should.containEql('<loc>http://my-ghost-blog.com/url/300</loc>');
+        describe('fn: getXml', function () {
+            beforeEach(function () {
+                sandbox.stub(urlService.utils, 'urlFor');
+            });
 
-                generator.siteMapContent.should.containEql('<image:loc>http://my-ghost-blog.com/images/post-100.jpg</image:loc>');
+            it('get cached xml', function () {
+                sandbox.spy(generator, 'generateXmlFromNodes');
+                generator.siteMapContent = 'something';
+                generator.getXml().should.eql('something');
+                generator.siteMapContent = null;
+                generator.generateXmlFromNodes.called.should.eql(false);
+            });
+
+            it('compare content output', function () {
+                let idxFirst, idxSecond, idxThird;
+
+                urlService.utils.urlFor.withArgs('image', {image: 'post-100.jpg'}, true).returns('http://my-ghost-blog.com/images/post-100.jpg');
+                urlService.utils.urlFor.withArgs('image', {image: 'post-200.jpg'}, true).returns('http://my-ghost-blog.com/images/post-200.jpg');
+                urlService.utils.urlFor.withArgs('image', {image: 'post-300.jpg'}, true).returns('http://my-ghost-blog.com/images/post-300.jpg');
+                urlService.utils.urlFor.withArgs('sitemap_xsl', true).returns('http://my-ghost-blog.com/sitemap.xsl');
+
+                generator.addUrl('http://my-ghost-blog.com/url/100/', testUtils.DataGenerator.forKnex.createPost({
+                    feature_image: 'post-100.jpg',
+                    created_at: (Date.UTC(2014, 11, 22, 12) - 360000) + 100,
+                    updated_at: null,
+                    published_at: null,
+                    slug: '100'
+                }));
+
+                generator.addUrl('http://my-ghost-blog.com/url/200/', testUtils.DataGenerator.forKnex.createPost({
+                    created_at: (Date.UTC(2014, 11, 22, 12) - 360000) + 200,
+                    updated_at: null,
+                    published_at: null,
+                    slug: '200'
+                }));
+
+                generator.addUrl('http://my-ghost-blog.com/url/300/', testUtils.DataGenerator.forKnex.createPost({
+                    created_at: (Date.UTC(2014, 11, 22, 12) - 360000) + 300,
+                    feature_image: 'post-300.jpg',
+                    updated_at: null,
+                    published_at: null,
+                    slug: '300'
+                }));
+
+                const xml = generator.getXml();
+
+                xml.should.containEql('<loc>http://my-ghost-blog.com/url/100/</loc>');
+                xml.should.containEql('<loc>http://my-ghost-blog.com/url/200/</loc>');
+                xml.should.containEql('<loc>http://my-ghost-blog.com/url/300/</loc>');
+
+                xml.should.containEql('<image:loc>http://my-ghost-blog.com/images/post-100.jpg</image:loc>');
                 // This should NOT be present
-                generator.siteMapContent.should.not.containEql('<image:loc>http://my-ghost-blog.com/images/post-200.jpg</image:loc>');
-                generator.siteMapContent.should.containEql('<image:loc>http://my-ghost-blog.com/images/post-300.jpg</image:loc>');
+                xml.should.not.containEql('<image:loc>http://my-ghost-blog.com/images/post-200.jpg</image:loc>');
+                xml.should.containEql('<image:loc>http://my-ghost-blog.com/images/post-300.jpg</image:loc>');
 
                 // Validate order newest to oldest
-                idxFirst = generator.siteMapContent.indexOf('<loc>http://my-ghost-blog.com/url/300</loc>');
-                idxSecond = generator.siteMapContent.indexOf('<loc>http://my-ghost-blog.com/url/200</loc>');
-                idxThird = generator.siteMapContent.indexOf('<loc>http://my-ghost-blog.com/url/100</loc>');
+                idxFirst = xml.indexOf('<loc>http://my-ghost-blog.com/url/300/</loc>');
+                idxSecond = xml.indexOf('<loc>http://my-ghost-blog.com/url/200/</loc>');
+                idxThird = xml.indexOf('<loc>http://my-ghost-blog.com/url/100/</loc>');
 
                 idxFirst.should.be.below(idxSecond);
                 idxSecond.should.be.below(idxThird);
+            });
+        });
 
-                done();
-            }).catch(done);
+        describe('fn: removeUrl', function () {
+            let post;
+
+            beforeEach(function () {
+                post = testUtils.DataGenerator.forKnex.createPost();
+                generator.nodeLookup[post.id] = 'node';
+            });
+
+            afterEach(function () {
+                generator.nodeLookup = {};
+                generator.nodeTimeLookup = {};
+            });
+
+            it('remove none existend url', function () {
+                generator.removeUrl('https://myblog.com/blog/podcast/featured/', testUtils.DataGenerator.forKnex.createPost());
+                Object.keys(generator.nodeLookup).length.should.eql(1);
+            });
+
+            it('remove existing url', function () {
+                generator.removeUrl('https://myblog.com/blog/test/', post);
+                Object.keys(generator.nodeLookup).length.should.eql(0);
+            });
         });
     });
 
@@ -228,77 +205,33 @@ describe('Generators', function () {
             generator = new PageGenerator();
         });
 
-        it('has a home item even if pages are empty', function (done) {
-            // Fake the api call to return no posts
-            sandbox.stub(api.posts, 'browse').callsFake(function () {
-                return Promise.resolve({posts: []});
-            });
+        describe('fn: getXml', function () {
+            it('add', function () {
+                generator.addUrl('http://my-ghost-blog.com/home/', {id: 'identifier1', staticRoute: true});
+                generator.addUrl('http://my-ghost-blog.com/magic/', {id: 'identifier2', staticRoute: false});
+                generator.addUrl('http://my-ghost-blog.com/subscribe/', {id: ObjectId.generate(), page: 1});
 
-            generator.init().then(function () {
-                should.exist(generator.siteMapContent);
+                generator.getXml();
+
+                generator.siteMapContent.should.containEql('<loc>http://my-ghost-blog.com/home/</loc>');
+                generator.siteMapContent.should.containEql('<loc>http://my-ghost-blog.com/magic/</loc>');
+                generator.siteMapContent.should.containEql('<loc>http://my-ghost-blog.com/subscribe/</loc>');
 
-                generator.siteMapContent.should.containEql('<loc>' + urlService.utils.urlFor('home', true) + '</loc>');
                 // <loc> should exist exactly one time
-                generator.siteMapContent.indexOf('<loc>').should.eql(generator.siteMapContent.lastIndexOf('<loc>'));
-
-                done();
-            }).catch(done);
+                generator.siteMapContent.match(/<loc>/g).length.should.eql(3);
+            });
         });
 
-        it('has a home item when pages are not empty', function (done) {
-            // Fake the api call to return no posts
-            sandbox.stub(api.posts, 'browse').callsFake(function () {
-                return Promise.resolve({
-                    posts: [_.extend(makeFakeDatum(100), {
-                        page: true,
-                        url: 'magic'
-                    })]
-                });
+        describe('fn: getPriorityForDatum', function () {
+            it('uses 1 priority for static routes', function () {
+                generator.getPriorityForDatum({
+                    staticRoute: true
+                }).should.equal(1);
             });
 
-            generator.init().then(function () {
-                should.exist(generator.siteMapContent);
-
-                generator.siteMapContent.should.containEql('<loc>' + urlService.utils.urlFor('home', true) + '</loc>');
-                generator.siteMapContent.should.containEql('<loc>' + urlService.utils.urlFor('page', {url: 'magic'}, true) + '</loc>');
-
-                done();
-            }).catch(done);
-        });
-
-        it('uses 1 priority for home page', function () {
-            generator.getPriorityForDatum({
-                name: 'home'
-            }).should.equal(1);
-        });
-        it('uses 0.8 priority for static pages', function () {
-            generator.getPriorityForDatum({}).should.equal(0.8);
-        });
-
-        it('does not create a node for a page with visibility that is not public', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                visibility: 'internal',
-                page: true
-            }));
-
-            urlNode.should.be.false();
-        });
-
-        it('does not create a node for a post', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                page: false
-            }));
-
-            urlNode.should.be.false();
-        });
-
-        it('adds an image:image element if page has an image', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                feature_image: 'page-100.jpg',
-                page: true
-            }));
-
-            urlNode.should.be.a.ValidUrlNode({withImage: true});
+            it('uses 0.8 priority for static pages or collection indexes', function () {
+                generator.getPriorityForDatum({}).should.equal(0.8);
+            });
         });
     });
 
@@ -307,24 +240,10 @@ describe('Generators', function () {
             generator = new TagGenerator();
         });
 
-        it('uses 0.6 priority for all tags', function () {
-            generator.getPriorityForDatum({}).should.equal(0.6);
-        });
-
-        it('does not create a node for a tag with visibility that is not public', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                visibility: 'internal'
-            }));
-
-            urlNode.should.be.false();
-        });
-
-        it('adds an image:image element if tag has an image', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                feature_image: 'tag-100.jpg'
-            }));
-
-            urlNode.should.be.a.ValidUrlNode({withImage: true});
+        describe('fn: getPriorityForDatum', function () {
+            it('uses 0.6 priority for all tags', function () {
+                generator.getPriorityForDatum({}).should.equal(0.6);
+            });
         });
     });
 
@@ -333,36 +252,28 @@ describe('Generators', function () {
             generator = new UserGenerator();
         });
 
-        it('uses 0.6 priority for author links', function () {
-            generator.getPriorityForDatum({}).should.equal(0.6);
+        describe('fn: getPriorityForDatum', function () {
+            it('uses 0.6 priority for author links', function () {
+                generator.getPriorityForDatum({}).should.equal(0.6);
+            });
         });
 
-        it('does not create a node for invited users', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                cover: 'user-100.jpg',
-                status: 'invited'
-            }));
+        describe('fn: validateImageUrl', function () {
+            it('image url is localhost', function () {
+                generator.validateImageUrl('http://localhost:2368/content/images/1.jpg').should.be.true();
+            });
 
-            urlNode.should.be.false();
-        });
+            it('image url is https', function () {
+                generator.validateImageUrl('https://myblog.com/content/images/1.png').should.be.true();
+            });
 
-        it('does not create a node for a user with visibility that is not public', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                cover_image: 'user-100.jpg',
-                status: 'active',
-                visibility: 'notpublic'
-            }));
+            it('image url is external', function () {
+                generator.validateImageUrl('https://myblog.com/1.jpg').should.be.true();
+            });
 
-            urlNode.should.be.false();
-        });
-
-        it('adds an image:image element if user has a cover image', function () {
-            var urlNode = generator.createUrlNodeFromDatum(_.extend(makeFakeDatum(100), {
-                cover_image: '/content/images/2016/01/user-100.jpg',
-                status: 'active'
-            }));
-
-            urlNode.should.be.a.ValidUrlNode({withImage: true});
+            it('no host', function () {
+                generator.validateImageUrl('/content/images/1.jpg').should.be.false();
+            });
         });
     });
 });
diff --git a/core/test/unit/data/xml/sitemap/manager_spec.js b/core/test/unit/data/xml/sitemap/manager_spec.js
index 7e73a05b04..aa38aedd19 100644
--- a/core/test/unit/data/xml/sitemap/manager_spec.js
+++ b/core/test/unit/data/xml/sitemap/manager_spec.js
@@ -1,6 +1,5 @@
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
-    Promise = require('bluebird'),
 
     // Stuff we are testing
     common = require('../../../../../server/lib/common'),
@@ -9,268 +8,112 @@ var should = require('should'),
     PageGenerator = require('../../../../../server/data/xml/sitemap/page-generator'),
     TagGenerator = require('../../../../../server/data/xml/sitemap/tag-generator'),
     UserGenerator = require('../../../../../server/data/xml/sitemap/user-generator'),
+    IndexGenerator = require('../../../../../server/data/xml/sitemap/index-generator'),
 
     sandbox = sinon.sandbox.create();
 
-describe('Sitemap', function () {
-    var makeStubManager = function () {
-        var posts, pages, tags, authors;
-        sandbox.stub(PostGenerator.prototype, 'refreshAll').returns(Promise.resolve());
-        sandbox.stub(PageGenerator.prototype, 'refreshAll').returns(Promise.resolve());
-        sandbox.stub(TagGenerator.prototype, 'refreshAll').returns(Promise.resolve());
-        sandbox.stub(UserGenerator.prototype, 'refreshAll').returns(Promise.resolve());
+describe('Unit: sitemap/manager', function () {
+    let eventsToRemember;
 
+    const makeStubManager = function () {
+        let posts, pages, tags, authors, index;
+
+        index = new IndexGenerator();
         posts = new PostGenerator();
         pages = new PageGenerator();
         tags = new TagGenerator();
         authors = new UserGenerator();
 
-        sandbox.spy(posts, 'init');
-        sandbox.spy(pages, 'init');
-        sandbox.spy(tags, 'init');
-        sandbox.spy(authors, 'init');
-
-        sandbox.stub(posts, 'addOrUpdateUrl');
-        sandbox.stub(pages, 'addOrUpdateUrl');
-        sandbox.stub(tags, 'addOrUpdateUrl');
-        sandbox.stub(authors, 'addOrUpdateUrl');
-
-        sandbox.stub(posts, 'removeUrl');
-        sandbox.stub(pages, 'removeUrl');
-        sandbox.stub(tags, 'removeUrl');
-        sandbox.stub(authors, 'removeUrl');
-
         return new SiteMapManager({posts: posts, pages: pages, tags: tags, authors: authors});
     };
 
+    beforeEach(function () {
+        eventsToRemember = {};
+
+        sandbox.stub(common.events, 'on').callsFake(function (eventName, callback) {
+            eventsToRemember[eventName] = callback;
+        });
+
+        sandbox.stub(PostGenerator.prototype, 'getXml');
+        sandbox.stub(PostGenerator.prototype, 'addUrl');
+        sandbox.stub(PostGenerator.prototype, 'removeUrl');
+        sandbox.stub(IndexGenerator.prototype, 'getXml');
+    });
+
     afterEach(function () {
         sandbox.restore();
-        common.events.removeAllListeners();
     });
 
     describe('SiteMapManager', function () {
-        var manager, fake;
-
-        should.exist(SiteMapManager);
+        let manager, fake;
 
         beforeEach(function () {
             manager = makeStubManager();
             fake = sandbox.stub();
         });
 
+        it('create SiteMapManager with defaults', function () {
+            const siteMapManager = new SiteMapManager();
+            should.exist(siteMapManager.posts);
+            should.exist(siteMapManager.pages);
+            should.exist(siteMapManager.users);
+            should.exist(siteMapManager.tags);
+        });
+
         it('can create a SiteMapManager instance', function () {
             should.exist(manager);
+            Object.keys(eventsToRemember).length.should.eql(3);
+            should.exist(eventsToRemember['url.added']);
+            should.exist(eventsToRemember['url.removed']);
+            should.exist(eventsToRemember['router.created']);
         });
 
-        it('can initialize', function (done) {
-            manager.initialized.should.equal(false);
-            manager.init().then(function () {
-                manager.posts.init.called.should.equal(true);
-                manager.pages.init.called.should.equal(true);
-                manager.authors.init.called.should.equal(true);
-                manager.tags.init.called.should.equal(true);
+        describe('trigger url events', function () {
+            it('url.added', function () {
+                eventsToRemember['url.added']({
+                    url: {
+                        relative: '/test/',
+                        absolute: 'https://myblog.com/test/'
+                    },
+                    resource: {
+                        config: {
+                            type: 'posts'
+                        },
+                        data: {}
+                    }
+                });
 
-                manager.initialized.should.equal(true);
+                PostGenerator.prototype.addUrl.calledOnce.should.be.true();
+            });
 
-                done();
-            }).catch(done);
+            it('url.removed', function () {
+                eventsToRemember['url.removed']({
+                    url: {
+                        relative: '/test/',
+                        absolute: 'https://myblog.com/test/'
+                    },
+                    resource: {
+                        config: {
+                            type: 'posts'
+                        },
+                        data: {}
+                    }
+                });
+
+                PostGenerator.prototype.removeUrl.calledOnce.should.be.true();
+            });
         });
 
-        it('updates page site map correctly', function (done) {
-            manager.init().then(function () {
-                common.events.on('page.added', function (fakeModel) {
-                    fakeModel.should.eql(fake);
-                    // page add events are ignored, as these are drafts
-                    manager.pages.addOrUpdateUrl.called.should.equal(false);
-                    manager.pages.removeUrl.called.should.equal(false);
-                });
-                common.events.on('page.edited', function () {
-                    // page edit events are ignored, as these are drafts
-                    manager.pages.addOrUpdateUrl.called.should.equal(false);
-                    manager.pages.removeUrl.called.should.equal(false);
-                });
-                common.events.on('page.published', function () {
-                    // page published events are when a url gets added
-                    manager.pages.addOrUpdateUrl.calledOnce.should.equal(true);
-                    manager.pages.removeUrl.called.should.equal(false);
-                });
-                common.events.on('page.published.edited', function () {
-                    // page published.edited events are when a url gets updated
-                    manager.pages.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.pages.removeUrl.called.should.equal(false);
-                });
-                common.events.on('page.deleted', function () {
-                    // page deleted events are ignored, as unpublished will be called if the page was published
-                    manager.pages.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.pages.removeUrl.called.should.equal(false);
-                });
-                common.events.on('page.unpublished', function () {
-                    // page unpublished events are when a url gets removed
-                    manager.pages.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.pages.removeUrl.calledOnce.should.equal(true);
-                });
-
-                common.events.emit('page.added', fake);
-                common.events.emit('page.edited', fake);
-                common.events.emit('page.published', fake);
-                common.events.emit('page.published.edited', fake);
-                common.events.emit('page.deleted', fake);
-                common.events.emit('page.unpublished', fake);
-
-                done();
-            }).catch(done);
+        it('fn: getSiteMapXml', function () {
+            PostGenerator.prototype.getXml.returns('xml');
+            manager.getSiteMapXml('posts').should.eql('xml');
+            PostGenerator.prototype.getXml.calledOnce.should.be.true();
         });
 
-        it('updates post site map', function (done) {
-            manager.init().then(function () {
-                common.events.on('post.added', function (fakeModel) {
-                    fakeModel.should.eql(fake);
-                    // post add events are ignored, as these are drafts
-                    manager.posts.addOrUpdateUrl.called.should.equal(false);
-                    manager.posts.removeUrl.called.should.equal(false);
-                });
-                common.events.on('post.edited', function () {
-                    // post edit events are ignored, as these are drafts
-                    manager.posts.addOrUpdateUrl.called.should.equal(false);
-                    manager.posts.removeUrl.called.should.equal(false);
-                });
-                common.events.on('post.published', function () {
-                    // post published events are when a url gets added
-                    manager.posts.addOrUpdateUrl.calledOnce.should.equal(true);
-                    manager.posts.removeUrl.called.should.equal(false);
-                });
-                common.events.on('post.published.edited', function () {
-                    // post published.edited events are when a url gets updated
-                    manager.posts.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.posts.removeUrl.called.should.equal(false);
-                });
-                common.events.on('post.deleted', function () {
-                    // post deleted events are ignored, as unpublished will be called if the post was published
-                    manager.posts.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.posts.removeUrl.called.should.equal(false);
-                });
-                common.events.on('post.unpublished', function () {
-                    // post unpublished events are when a url gets removed
-                    manager.posts.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.posts.removeUrl.calledOnce.should.equal(true);
-                });
-
-                common.events.emit('post.added', fake);
-                common.events.emit('post.edited', fake);
-                common.events.emit('post.published', fake);
-                common.events.emit('post.published.edited', fake);
-                common.events.emit('post.deleted', fake);
-                common.events.emit('post.unpublished', fake);
-
-                done();
-            }).catch(done);
-        });
-
-        it('doesn\'t add posts until they are published', function (done) {
-            manager.init().then(function () {
-                common.events.on('post.added', function () {
-                    manager.posts.addOrUpdateUrl.called.should.equal(false);
-                    manager.posts.removeUrl.called.should.equal(false);
-                });
-
-                common.events.on('post.edited', function () {
-                    manager.posts.addOrUpdateUrl.called.should.equal(false);
-                    manager.posts.removeUrl.called.should.equal(false);
-                });
-
-                common.events.on('post.published', function () {
-                    manager.posts.addOrUpdateUrl.calledOnce.should.equal(true);
-                    manager.posts.removeUrl.called.should.equal(false);
-                });
-
-                common.events.emit('post.added', fake);
-                common.events.emit('post.edited', fake);
-                common.events.emit('post.published', fake);
-
-                done();
-            }).catch(done);
-        });
-
-        it('deletes posts that were unpublished', function (done) {
-            manager.init().then(function () {
-                common.events.on('post.unpublished', function () {
-                    manager.posts.addOrUpdateUrl.called.should.equal(false);
-                    manager.posts.removeUrl.calledOnce.should.equal(true);
-                });
-
-                common.events.emit('post.unpublished', fake);
-
-                done();
-            }).catch(done);
-        });
-
-        it('updates authors site map', function (done) {
-            manager.init().then(function () {
-                common.events.on('user.added', function (fakeModel) {
-                    fakeModel.should.eql(fake);
-                    // user added is ignored as this may be an invited user
-                    manager.authors.addOrUpdateUrl.called.should.equal(false);
-                    manager.authors.removeUrl.called.should.equal(false);
-                });
-                common.events.on('user.edited', function () {
-                    // user edited is ignored as this may be an invited user
-                    manager.authors.addOrUpdateUrl.called.should.equal(false);
-                    manager.authors.removeUrl.called.should.equal(false);
-                });
-                common.events.on('user.activated', function () {
-                    // user activated is the point we know the user can be added
-                    manager.authors.addOrUpdateUrl.calledOnce.should.equal(true);
-                    manager.authors.removeUrl.called.should.equal(false);
-                });
-                common.events.on('user.activated.edited', function () {
-                    // user activated.edited means we can be sure the user is active
-                    manager.authors.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.authors.removeUrl.called.should.equal(false);
-                });
-                common.events.on('user.deleted', function () {
-                    // user deleted is ignored as this may be an invited user
-                    manager.authors.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.authors.removeUrl.called.should.equal(false);
-                });
-                common.events.on('user.deactivated', function () {
-                    // user deleted is ignored as this may be an invited user
-                    manager.authors.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.authors.removeUrl.calledOnce.should.equal(true);
-                });
-
-                common.events.emit('user.added', fake);
-                common.events.emit('user.edited', fake);
-                common.events.emit('user.activated', fake);
-                common.events.emit('user.activated.edited', fake);
-                common.events.emit('user.deleted', fake);
-                common.events.emit('user.deactivated', fake);
-
-                done();
-            }).catch(done);
-        });
-
-        it('updates tags site map', function (done) {
-            manager.init().then(function () {
-                common.events.on('tag.added', function (fakeModel) {
-                    fakeModel.should.eql(fake);
-                    manager.tags.addOrUpdateUrl.calledOnce.should.equal(true);
-                    manager.tags.removeUrl.called.should.equal(false);
-                });
-                common.events.on('tag.edited', function () {
-                    manager.tags.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.tags.removeUrl.called.should.equal(false);
-                });
-                common.events.on('tag.deleted', function () {
-                    manager.tags.addOrUpdateUrl.calledTwice.should.equal(true);
-                    manager.tags.removeUrl.calledOnce.should.equal(true);
-                });
-
-                common.events.emit('tag.added', fake);
-                common.events.emit('tag.edited', fake);
-                common.events.emit('tag.deleted', fake);
-
-                done();
-            }).catch(done);
+        it('fn: getIndexXml', function () {
+            IndexGenerator.prototype.getXml.returns('xml');
+            manager.getIndexXml().should.eql('xml');
+            IndexGenerator.prototype.getXml.calledOnce.should.be.true();
         });
     });
 });
diff --git a/core/test/unit/helpers/author_spec.js b/core/test/unit/helpers/author_spec.js
index 5f999dcf72..932fc296d0 100644
--- a/core/test/unit/helpers/author_spec.js
+++ b/core/test/unit/helpers/author_spec.js
@@ -1,40 +1,52 @@
-var should = require('should'),
-
-// Stuff we are testing
+const should = require('should'),
+    sinon = require('sinon'),
+    sandbox = sinon.sandbox.create(),
+    testUtils = require('../../utils'),
+    urlService = require('../../../server/services/url'),
     helpers = require('../../../server/helpers');
 
 describe('{{author}} helper', function () {
-    it('Returns the link to the author from the context', function () {
-        var data = {author: {name: 'abc 123', slug: 'abc123', bio: '', website: '', status: '', location: ''}},
-            result = helpers.author.call(data, {hash: {}});
+    beforeEach(function () {
+        sandbox.stub(urlService, 'getUrlByResourceId');
+    });
 
-        String(result).should.equal('<a href="/author/abc123/">abc 123</a>');
+    afterEach(function () {
+        sandbox.restore();
+    });
+
+    it('Returns the link to the author from the context', function () {
+        const author = testUtils.DataGenerator.forKnex.createUser({slug: 'abc123', name: 'abc 123'});
+
+        urlService.getUrlByResourceId.withArgs(author.id).returns('author url');
+
+        const result = helpers.author.call({author: author}, {hash: {}});
+        String(result).should.equal('<a href="author url">abc 123</a>');
     });
 
     it('Returns the full name of the author from the context if no autolink', function () {
-        var data = {author: {name: 'abc 123', slug: 'abc123'}},
-            result = helpers.author.call(data, {hash: {autolink: 'false'}});
-
+        const author = testUtils.DataGenerator.forKnex.createUser({slug: 'abc123', name: 'abc 123'});
+        const result = helpers.author.call({author: author}, {hash: {autolink: 'false'}});
         String(result).should.equal('abc 123');
+        urlService.getUrlByResourceId.called.should.be.false();
     });
 
     it('Returns a blank string where author data is missing', function () {
-        var data = {author: null},
-            result = helpers.author.call(data, {hash: {}});
-
+        const result = helpers.author.call({author:null}, {hash: {}});
         String(result).should.equal('');
     });
 
     it('Functions as block helper if called with #', function () {
-        var data = {author: {name: 'abc 123', slug: 'abc123'}},
-            // including fn emulates the #
-            result = helpers.author.call(data, {
-                hash: {}, fn: function () {
-                    return 'FN';
-                }
-            });
+        const author = testUtils.DataGenerator.forKnex.createUser({slug: 'abc123', name: 'abc 123'});
+
+        // including fn emulates the #
+        const result = helpers.author.call({author: author}, {
+            hash: {}, fn: function () {
+                return 'FN';
+            }
+        });
 
         // It outputs the result of fn
         String(result).should.equal('FN');
+        urlService.getUrlByResourceId.called.should.be.false();
     });
 });
diff --git a/core/test/unit/helpers/authors_spec.js b/core/test/unit/helpers/authors_spec.js
index c2e2c1047a..4d9c79b001 100644
--- a/core/test/unit/helpers/authors_spec.js
+++ b/core/test/unit/helpers/authors_spec.js
@@ -1,7 +1,9 @@
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
+    urlService = require('../../../server/services/url'),
     helpers = require('../../../server/helpers'),
     models = require('../../../server/models'),
+    testUtils = require('../../utils'),
     sandbox = sinon.sandbox.create();
 
 describe('{{authors}} helper', function () {
@@ -9,165 +11,195 @@ describe('{{authors}} helper', function () {
         models.init();
     });
 
+    beforeEach(function () {
+        sandbox.stub(urlService, 'getUrlByResourceId');
+    });
+
     afterEach(function () {
         sandbox.restore();
     });
 
     it('can return string with authors', function () {
-        var authors = [{name: 'Michael'}, {name: 'Thomas'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {autolink: 'false'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'Michael'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'Thomas'})
+        ];
+
+        const rendered = helpers.authors.call({authors: authors}, {hash: {autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('Michael, Thomas');
     });
 
     it('can use a different separator', function () {
-        var authors = [{name: 'haunted'}, {name: 'ghost'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {separator: '|', autolink: 'false'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'haunted'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'ghost'})
+        ];
 
+        const rendered = helpers.authors.call({authors: authors}, {hash: {separator: '|', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('haunted|ghost');
     });
 
     it('can add a single prefix to multiple authors', function () {
-        var authors = [{name: 'haunted'}, {name: 'ghost'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {prefix: 'on ', autolink: 'false'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'haunted'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'ghost'})
+        ];
 
+        const rendered = helpers.authors.call({authors: authors}, {hash: {prefix: 'on ', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('on haunted, ghost');
     });
 
     it('can add a single suffix to multiple authors', function () {
-        var authors = [{name: 'haunted'}, {name: 'ghost'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {suffix: ' forever', autolink: 'false'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'haunted'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'ghost'})
+        ];
 
+        const rendered = helpers.authors.call({authors: authors}, {hash: {suffix: ' forever', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('haunted, ghost forever');
     });
 
     it('can add a prefix and suffix to multiple authors', function () {
-        var authors = [{name: 'haunted'}, {name: 'ghost'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {suffix: ' forever', prefix: 'on ', autolink: 'false'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'haunted'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'ghost'})
+        ];
 
+        const rendered = helpers.authors.call({authors: authors}, {hash: {suffix: ' forever', prefix: 'on ', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('on haunted, ghost forever');
     });
 
     it('can add a prefix and suffix with HTML', function () {
-        var authors = [{name: 'haunted'}, {name: 'ghost'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {suffix: ' &bull;', prefix: '&hellip; ', autolink: 'false'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'haunted'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'ghost'})
+        ];
 
+        const rendered = helpers.authors.call({authors: authors}, {hash: {suffix: ' &bull;', prefix: '&hellip; ', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('&hellip; haunted, ghost &bull;');
     });
 
     it('does not add prefix or suffix if no authors exist', function () {
-        var rendered = helpers.authors.call(
-            {},
-            {hash: {prefix: 'on ', suffix: ' forever', autolink: 'false'}}
-        );
-
+        const rendered = helpers.authors.call({}, {hash: {prefix: 'on ', suffix: ' forever', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('');
     });
 
     it('can autolink authors to author pages', function () {
-        var authors = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}],
-            rendered = helpers.authors.call(
-                {authors: authors}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'bar', slug: 'bar'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(authors[0].id).returns('author url 1');
+        urlService.getUrlByResourceId.withArgs(authors[1].id).returns('author url 2');
+
+        const rendered = helpers.authors.call({authors: authors});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/author/foo-bar/">foo</a>, <a href="/author/bar/">bar</a>');
+        String(rendered).should.equal('<a href="author url 1">foo</a>, <a href="author url 2">bar</a>');
     });
 
     it('can limit no. authors output to 1', function () {
-        var authors = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {limit: '1'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'bar', slug: 'bar'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(authors[0].id).returns('author url 1');
+
+        const rendered = helpers.authors.call({authors: authors}, {hash: {limit: '1'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/author/foo-bar/">foo</a>');
+        String(rendered).should.equal('<a href="author url 1">foo</a>');
     });
 
     it('can list authors from a specified no.', function () {
-        var authors = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {from: '2'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'bar', slug: 'bar'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(authors[1].id).returns('author url 2');
+
+        const rendered = helpers.authors.call({authors: authors}, {hash: {from: '2'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/author/bar/">bar</a>');
+        String(rendered).should.equal('<a href="author url 2">bar</a>');
     });
 
     it('can list authors to a specified no.', function () {
-        var authors = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {to: '1'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'bar', slug: 'bar'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(authors[0].id).returns('author url');
+
+        const rendered = helpers.authors.call({authors: authors}, {hash: {to: '1'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/author/foo-bar/">foo</a>');
+        String(rendered).should.equal('<a href="author url">foo</a>');
     });
 
     it('can list authors in a range', function () {
-        var authors = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}, {name: 'baz', slug: 'baz'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {from: '2', to: '3'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'bar', slug: 'bar'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'baz', slug: 'baz'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(authors[1].id).returns('author url 2');
+        urlService.getUrlByResourceId.withArgs(authors[2].id).returns('author url 3');
+
+        const rendered = helpers.authors.call({authors: authors}, {hash: {from: '2', to: '3'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/author/bar/">bar</a>, <a href="/author/baz/">baz</a>');
+        String(rendered).should.equal('<a href="author url 2">bar</a>, <a href="author url 3">baz</a>');
     });
 
     it('can limit no. authors and output from 2', function () {
-        var authors = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}, {name: 'baz', slug: 'baz'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {from: '2', limit: '1'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'bar', slug: 'bar'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'baz', slug: 'baz'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(authors[1].id).returns('author url x');
+
+        const rendered = helpers.authors.call({authors: authors}, {hash: {from: '2', limit: '1'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/author/bar/">bar</a>');
+        String(rendered).should.equal('<a href="author url x">bar</a>');
     });
 
     it('can list authors in a range (ignore limit)', function () {
-        var authors = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}, {name: 'baz', slug: 'baz'}],
-            rendered = helpers.authors.call(
-                {authors: authors},
-                {hash: {from: '1', to: '3', limit: '2'}}
-            );
+        const authors = [
+            testUtils.DataGenerator.forKnex.createUser({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'bar', slug: 'bar'}),
+            testUtils.DataGenerator.forKnex.createUser({name: 'baz', slug: 'baz'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(authors[0].id).returns('author url a');
+        urlService.getUrlByResourceId.withArgs(authors[1].id).returns('author url b');
+        urlService.getUrlByResourceId.withArgs(authors[2].id).returns('author url c');
+
+        const rendered = helpers.authors.call({authors: authors}, {hash: {from: '1', to: '3', limit: '2'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/author/foo-bar/">foo</a>, <a href="/author/bar/">bar</a>, <a href="/author/baz/">baz</a>');
+        String(rendered).should.equal('<a href="author url a">foo</a>, <a href="author url b">bar</a>, <a href="author url c">baz</a>');
     });
 });
diff --git a/core/test/unit/helpers/tags_spec.js b/core/test/unit/helpers/tags_spec.js
index 0907d31a83..00a7de5bc2 100644
--- a/core/test/unit/helpers/tags_spec.js
+++ b/core/test/unit/helpers/tags_spec.js
@@ -1,257 +1,284 @@
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
-
-// Stuff we are testing
+    testUtils = require('../../utils'),
+    urlService = require('../../../server/services/url'),
+    models = require('../../../server/models'),
     helpers = require('../../../server/helpers'),
-
     sandbox = sinon.sandbox.create();
 
 describe('{{tags}} helper', function () {
+    before(function () {
+        models.init();
+    });
+
+    beforeEach(function () {
+        sandbox.stub(urlService, 'getUrlByResourceId');
+    });
+
     afterEach(function () {
         sandbox.restore();
     });
 
     it('can return string with tags', function () {
-        var tags = [{name: 'foo'}, {name: 'bar'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {autolink: 'false'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'foo'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'bar'})
+        ];
+
+        const rendered = helpers.tags.call({tags: tags}, {hash: {autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('foo, bar');
     });
 
     it('can use a different separator', function () {
-        var tags = [{name: 'haunted'}, {name: 'ghost'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {separator: '|', autolink: 'false'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'haunted'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'ghost'})
+        ];
 
+        const rendered = helpers.tags.call({tags: tags}, {hash: {separator: '|', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('haunted|ghost');
     });
 
     it('can add a single prefix to multiple tags', function () {
-        var tags = [{name: 'haunted'}, {name: 'ghost'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {prefix: 'on ', autolink: 'false'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'haunted'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'ghost'})
+        ];
 
+        const rendered = helpers.tags.call({tags: tags}, {hash: {prefix: 'on ', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('on haunted, ghost');
     });
 
     it('can add a single suffix to multiple tags', function () {
-        var tags = [{name: 'haunted'}, {name: 'ghost'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {suffix: ' forever', autolink: 'false'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'haunted'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'ghost'})
+        ];
 
+        const rendered = helpers.tags.call({tags: tags}, {hash: {suffix: ' forever', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('haunted, ghost forever');
     });
 
     it('can add a prefix and suffix to multiple tags', function () {
-        var tags = [{name: 'haunted'}, {name: 'ghost'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {suffix: ' forever', prefix: 'on ', autolink: 'false'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'haunted'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'ghost'})
+        ];
 
+        const rendered = helpers.tags.call({tags: tags}, {hash: {suffix: ' forever', prefix: 'on ', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('on haunted, ghost forever');
     });
 
     it('can add a prefix and suffix with HTML', function () {
-        var tags = [{name: 'haunted'}, {name: 'ghost'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {suffix: ' &bull;', prefix: '&hellip; ', autolink: 'false'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'haunted'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'ghost'})
+        ];
 
+        const rendered = helpers.tags.call({tags: tags}, {hash: {suffix: ' &bull;', prefix: '&hellip; ', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('&hellip; haunted, ghost &bull;');
     });
 
     it('does not add prefix or suffix if no tags exist', function () {
-        var rendered = helpers.tags.call(
-            {},
-            {hash: {prefix: 'on ', suffix: ' forever', autolink: 'false'}}
-        );
-
+        const rendered = helpers.tags.call({}, {hash: {prefix: 'on ', suffix: ' forever', autolink: 'false'}});
         should.exist(rendered);
 
         String(rendered).should.equal('');
     });
 
     it('can autolink tags to tag pages', function () {
-        var tags = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}],
-            rendered = helpers.tags.call(
-                {tags: tags}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'bar', slug: 'bar'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(tags[0].id).returns('tag url 1');
+        urlService.getUrlByResourceId.withArgs(tags[1].id).returns('tag url 2');
+
+        const rendered = helpers.tags.call({tags: tags});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/tag/foo-bar/">foo</a>, <a href="/tag/bar/">bar</a>');
+        String(rendered).should.equal('<a href="tag url 1">foo</a>, <a href="tag url 2">bar</a>');
     });
 
     it('can limit no. tags output to 1', function () {
-        var tags = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {limit: '1'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'bar', slug: 'bar'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(tags[0].id).returns('tag url 1');
+
+        const rendered = helpers.tags.call({tags: tags}, {hash: {limit: '1'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/tag/foo-bar/">foo</a>');
+        String(rendered).should.equal('<a href="tag url 1">foo</a>');
     });
 
     it('can list tags from a specified no.', function () {
-        var tags = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {from: '2'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'bar', slug: 'bar'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(tags[1].id).returns('tag url 2');
+
+        const rendered = helpers.tags.call({tags: tags}, {hash: {from: '2'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/tag/bar/">bar</a>');
+        String(rendered).should.equal('<a href="tag url 2">bar</a>');
     });
 
     it('can list tags to a specified no.', function () {
-        var tags = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {to: '1'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'bar', slug: 'bar'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(tags[0].id).returns('tag url x');
+
+        const rendered = helpers.tags.call({tags: tags}, {hash: {to: '1'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/tag/foo-bar/">foo</a>');
+        String(rendered).should.equal('<a href="tag url x">foo</a>');
     });
 
     it('can list tags in a range', function () {
-        var tags = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}, {name: 'baz', slug: 'baz'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {from: '2', to: '3'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'bar', slug: 'bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'baz', slug: 'baz'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(tags[1].id).returns('tag url b');
+        urlService.getUrlByResourceId.withArgs(tags[2].id).returns('tag url c');
+
+        const rendered = helpers.tags.call({tags: tags}, {hash: {from: '2', to: '3'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/tag/bar/">bar</a>, <a href="/tag/baz/">baz</a>');
+        String(rendered).should.equal('<a href="tag url b">bar</a>, <a href="tag url c">baz</a>');
     });
 
     it('can limit no. tags and output from 2', function () {
-        var tags = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}, {name: 'baz', slug: 'baz'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {from: '2', limit: '1'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'bar', slug: 'bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'baz', slug: 'baz'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(tags[1].id).returns('tag url b');
+
+        const rendered = helpers.tags.call({tags: tags}, {hash: {from: '2', limit: '1'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/tag/bar/">bar</a>');
+        String(rendered).should.equal('<a href="tag url b">bar</a>');
     });
 
     it('can list tags in a range (ignore limit)', function () {
-        var tags = [{name: 'foo', slug: 'foo-bar'}, {name: 'bar', slug: 'bar'}, {name: 'baz', slug: 'baz'}],
-            rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {from: '1', to: '3', limit: '2'}}
-            );
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'bar', slug: 'bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'baz', slug: 'baz'})
+        ];
+
+        urlService.getUrlByResourceId.withArgs(tags[0].id).returns('tag url a');
+        urlService.getUrlByResourceId.withArgs(tags[1].id).returns('tag url b');
+        urlService.getUrlByResourceId.withArgs(tags[2].id).returns('tag url c');
+
+        const rendered = helpers.tags.call({tags: tags}, {hash: {from: '1', to: '3', limit: '2'}});
         should.exist(rendered);
 
-        String(rendered).should.equal('<a href="/tag/foo-bar/">foo</a>, <a href="/tag/bar/">bar</a>, <a href="/tag/baz/">baz</a>');
+        String(rendered).should.equal('<a href="tag url a">foo</a>, <a href="tag url b">bar</a>, <a href="tag url c">baz</a>');
     });
 
     describe('Internal tags', function () {
-        var tags = [
-            {name: 'foo', slug: 'foo-bar', visibility: 'public'},
-            {name: '#bar', slug: 'hash-bar', visibility: 'internal'},
-            {name: 'bar', slug: 'bar', visibility: 'public'},
-            {name: 'baz', slug: 'baz', visibility: 'public'},
-            {name: 'buzz', slug: 'buzz'}
+        const tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'foo', slug: 'foo-bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: '#bar', slug: 'hash-bar', visibility: 'internal'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'bar', slug: 'bar'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'baz', slug: 'baz'}),
+            testUtils.DataGenerator.forKnex.createTag({name: 'buzz', slug: 'buzz'})
         ];
 
+        const tags1 = [
+            testUtils.DataGenerator.forKnex.createTag({name: '#foo', slug: 'hash-foo-bar', visibility: 'internal'}),
+            testUtils.DataGenerator.forKnex.createTag({name: '#bar', slug: 'hash-bar', visibility: 'internal'})
+        ];
+
+        beforeEach(function () {
+            urlService.getUrlByResourceId.withArgs(tags[0].id).returns('1');
+            urlService.getUrlByResourceId.withArgs(tags[1].id).returns('2');
+            urlService.getUrlByResourceId.withArgs(tags[2].id).returns('3');
+            urlService.getUrlByResourceId.withArgs(tags[3].id).returns('4');
+            urlService.getUrlByResourceId.withArgs(tags[4].id).returns('5');
+        });
+
         it('will not output internal tags by default', function () {
-            var rendered = helpers.tags.call(
-                {tags: tags}
-            );
+            const rendered = helpers.tags.call({tags: tags});
 
             String(rendered).should.equal(
-                '<a href="/tag/foo-bar/">foo</a>, ' +
-                '<a href="/tag/bar/">bar</a>, ' +
-                '<a href="/tag/baz/">baz</a>, ' +
-                '<a href="/tag/buzz/">buzz</a>'
+                '<a href="1">foo</a>, ' +
+                '<a href="3">bar</a>, ' +
+                '<a href="4">baz</a>, ' +
+                '<a href="5">buzz</a>'
             );
         });
 
         it('should still correctly apply from & limit tags', function () {
-            var rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {from: '2', limit: '2'}}
-            );
+            const rendered = helpers.tags.call({tags: tags}, {hash: {from: '2', limit: '2'}});
 
             String(rendered).should.equal(
-                '<a href="/tag/bar/">bar</a>, ' +
-                '<a href="/tag/baz/">baz</a>'
+                '<a href="3">bar</a>, ' +
+                '<a href="4">baz</a>'
             );
         });
 
         it('should output all tags with visibility="all"', function () {
-            var rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {visibility: 'all'}}
-            );
+            const rendered = helpers.tags.call({tags: tags}, {hash: {visibility: 'all'}});
 
             String(rendered).should.equal(
-                '<a href="/tag/foo-bar/">foo</a>, ' +
-                '<a href="/tag/hash-bar/">#bar</a>, ' +
-                '<a href="/tag/bar/">bar</a>, ' +
-                '<a href="/tag/baz/">baz</a>, ' +
-                '<a href="/tag/buzz/">buzz</a>'
+                '<a href="1">foo</a>, ' +
+                '<a href="2">#bar</a>, ' +
+                '<a href="3">bar</a>, ' +
+                '<a href="4">baz</a>, ' +
+                '<a href="5">buzz</a>'
             );
         });
 
         it('should output all tags with visibility property set with visibility="public,internal"', function () {
-            var rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {visibility: 'public,internal'}}
-            );
+            const rendered = helpers.tags.call({tags: tags}, {hash: {visibility: 'public,internal'}});
             should.exist(rendered);
 
             String(rendered).should.equal(
-                '<a href="/tag/foo-bar/">foo</a>, ' +
-                '<a href="/tag/hash-bar/">#bar</a>, ' +
-                '<a href="/tag/bar/">bar</a>, ' +
-                '<a href="/tag/baz/">baz</a>'
+                '<a href="1">foo</a>, ' +
+                '<a href="2">#bar</a>, ' +
+                '<a href="3">bar</a>, ' +
+                '<a href="4">baz</a>, ' +
+                '<a href="5">buzz</a>'
             );
         });
 
         it('Should output only internal tags with visibility="internal"', function () {
-            var rendered = helpers.tags.call(
-                {tags: tags},
-                {hash: {visibility: 'internal'}}
-            );
+            const rendered = helpers.tags.call({tags: tags}, {hash: {visibility: 'internal'}});
             should.exist(rendered);
 
-            String(rendered).should.equal('<a href="/tag/hash-bar/">#bar</a>');
+            String(rendered).should.equal('<a href="2">#bar</a>');
         });
 
         it('should output nothing if all tags are internal', function () {
-            var tags = [
-                    {name: '#foo', slug: 'hash-foo-bar', visibility: 'internal'},
-                    {name: '#bar', slug: 'hash-bar', visibility: 'internal'}
-                ],
-                rendered = helpers.tags.call(
-                    {tags: tags},
-                    {hash: {prefix: 'stuff'}}
-                );
+            const rendered = helpers.tags.call({tags: tags1}, {hash: {prefix: 'stuff'}});
             should.exist(rendered);
 
             String(rendered).should.equal('');
diff --git a/core/test/unit/helpers/url_spec.js b/core/test/unit/helpers/url_spec.js
index 9a3eef3ba8..44869e1092 100644
--- a/core/test/unit/helpers/url_spec.js
+++ b/core/test/unit/helpers/url_spec.js
@@ -1,13 +1,12 @@
 var should = require('should'),
     sinon = require('sinon'),
     Promise = require('bluebird'),
+    testUtils = require('../../utils'),
     configUtils = require('../../utils/configUtils'),
     markdownToMobiledoc = require('../../utils/fixtures/data-generator').markdownToMobiledoc,
-
-// Stuff we are testing
     helpers = require('../../../server/helpers'),
+    urlService = require('../../../server/services/url'),
     api = require('../../../server/api'),
-
     sandbox = sinon.sandbox.create();
 
 describe('{{url}} helper', function () {
@@ -19,6 +18,9 @@ describe('{{url}} helper', function () {
 
     beforeEach(function () {
         rendered = null;
+
+        sandbox.stub(urlService, 'getUrlByResourceId');
+
         sandbox.stub(api.settings, 'read').callsFake(function () {
             return Promise.resolve({settings: [{value: '/:slug/'}]});
         });
@@ -33,7 +35,7 @@ describe('{{url}} helper', function () {
     });
 
     it('should return the slug with a prefix slash if the context is a post', function () {
-        rendered = helpers.url.call({
+        const post = testUtils.DataGenerator.forKnex.createPost({
             html: 'content',
             mobiledoc: markdownToMobiledoc('ff'),
             title: 'title',
@@ -42,60 +44,65 @@ describe('{{url}} helper', function () {
             url: '/slug/'
         });
 
+        urlService.getUrlByResourceId.withArgs(post.id, {absolute: undefined, secure: undefined}).returns('/slug/');
+
+        rendered = helpers.url.call(post);
         should.exist(rendered);
         rendered.string.should.equal('/slug/');
     });
 
     it('should output an absolute URL if the option is present', function () {
-        rendered = helpers.url.call(
-            {html: 'content', mobiledoc: markdownToMobiledoc('ff'), title: 'title', slug: 'slug', url: '/slug/', created_at: new Date(0)},
-            {hash: {absolute: 'true'}}
-        );
+        const post = testUtils.DataGenerator.forKnex.createPost({
+            html: 'content',
+            mobiledoc: markdownToMobiledoc('ff'),
+            title: 'title',
+            slug: 'slug',
+            url: '/slug/',
+            created_at: new Date(0)
+        });
 
+        urlService.getUrlByResourceId.withArgs(post.id, {absolute: 'true', secure: undefined}).returns('http://localhost:82832/slug/');
+
+        rendered = helpers.url.call(post, {hash: {absolute: 'true'}});
         should.exist(rendered);
         rendered.string.should.equal('http://localhost:82832/slug/');
     });
 
     it('should output an absolute URL with https if the option is present and secure', function () {
-        rendered = helpers.url.call(
-            {
-                html: 'content', mobiledoc: markdownToMobiledoc('ff'), title: 'title', slug: 'slug',
-                url: '/slug/', created_at: new Date(0), secure: true
-            },
-            {hash: {absolute: 'true'}}
-        );
+        const post = testUtils.DataGenerator.forKnex.createPost({
+            html: 'content',
+            mobiledoc: markdownToMobiledoc('ff'),
+            title: 'title',
+            slug: 'slug',
+            url: '/slug/',
+            created_at: new Date(0),
+            secure: true
+        });
 
-        should.exist(rendered);
-        rendered.string.should.equal('https://localhost:82832/slug/');
-    });
-
-    it('should output an absolute URL with https if secure', function () {
-        rendered = helpers.url.call(
-            {
-                html: 'content', mobiledoc: markdownToMobiledoc('ff'), title: 'title', slug: 'slug',
-                url: '/slug/', created_at: new Date(0), secure: true
-            },
-            {hash: {absolute: 'true'}}
-        );
+        urlService.getUrlByResourceId.withArgs(post.id, {absolute: 'true', secure: true}).returns('https://localhost:82832/slug/');
 
+        rendered = helpers.url.call(post, {hash: {absolute: 'true'}});
         should.exist(rendered);
         rendered.string.should.equal('https://localhost:82832/slug/');
     });
 
     it('should return the slug with a prefixed /tag/ if the context is a tag', function () {
-        rendered = helpers.url.call({
+        const tag = testUtils.DataGenerator.forKnex.createTag({
             name: 'the tag',
             slug: 'the-tag',
             description: null,
             parent: null
         });
 
+        urlService.getUrlByResourceId.withArgs(tag.id, {absolute: undefined, secure: undefined}).returns('/tag/the-tag/');
+
+        rendered = helpers.url.call(tag);
         should.exist(rendered);
         rendered.string.should.equal('/tag/the-tag/');
     });
 
     it('should return the slug with a prefixed /author/ if the context is author', function () {
-        rendered = helpers.url.call({
+        const user = testUtils.DataGenerator.forKnex.createUser({
             bio: null,
             website: null,
             profile_image: null,
@@ -103,24 +110,15 @@ describe('{{url}} helper', function () {
             slug: 'some-author'
         });
 
+        urlService.getUrlByResourceId.withArgs(user.id, {absolute: undefined, secure: undefined}).returns('/author/some-author/');
+
+        rendered = helpers.url.call(user);
         should.exist(rendered);
         rendered.string.should.equal('/author/some-author/');
     });
 
     it('should return / if not a post or tag', function () {
-        rendered = helpers.url.call({mobiledoc: markdownToMobiledoc('ff'), title: 'title', slug: 'slug'});
-        should.exist(rendered);
-        rendered.string.should.equal('/');
-
-        rendered = helpers.url.call({html: 'content', title: 'title', slug: 'slug'});
-        should.exist(rendered);
-        rendered.string.should.equal('/');
-
-        rendered = helpers.url.call({html: 'content', mobiledoc: markdownToMobiledoc('ff'), slug: 'slug'});
-        should.exist(rendered);
-        rendered.string.should.equal('/');
-
-        rendered = helpers.url.call({html: 'content', mobiledoc: markdownToMobiledoc('ff'), title: 'title'});
+        rendered = helpers.url.call({something: 'key'});
         should.exist(rendered);
         rendered.string.should.equal('/');
     });
diff --git a/core/test/unit/models/post_spec.js b/core/test/unit/models/post_spec.js
index 0f190270bf..936bebf5ff 100644
--- a/core/test/unit/models/post_spec.js
+++ b/core/test/unit/models/post_spec.js
@@ -6,6 +6,7 @@ const should = require('should'),
     testUtils = require('../../utils'),
     knex = require('../../../server/data/db').knex,
     settingsCache = require('../../../server/services/settings/cache'),
+    urlService = require('../../../server/services/url'),
     schema = require('../../../server/data/schema'),
     models = require('../../../server/models'),
     common = require('../../../server/lib/common'),
@@ -27,6 +28,7 @@ describe('Unit: models/post', function () {
 
     beforeEach(function () {
         sandbox.stub(security.password, 'hash').resolves('$2a$10$we16f8rpbrFZ34xWj0/ZC.LTPUux8ler7bcdTs5qIleN6srRHhilG');
+        sandbox.stub(urlService, 'getUrlByResourceId');
     });
 
     afterEach(function () {
@@ -41,22 +43,6 @@ describe('Unit: models/post', function () {
         sandbox.restore();
     });
 
-    describe('findPage', function () {
-        /**
-         * This is a @bug.
-         * If you don't include tags, we can't generate the url properly.
-         * Will be fixed when merging channels, because the post model has no longer generate the url.
-         */
-        it('[bug] permalink: /:primary_tag/:slug/, columns: [title,url]', function () {
-            sandbox.stub(settingsCache, 'get').withArgs('permalinks').returns('/:primary_tag/:slug/');
-
-            return models.Post.findPage({columns: ['title', 'url']})
-                .then(function (result) {
-                    result.posts[0].url.should.eql('/all/html-ipsum/');
-                });
-        });
-    });
-
     describe('add', function () {
         describe('ensure full set of data for model events', function () {
             it('default', function () {
diff --git a/core/test/unit/services/apps/proxy_spec.js b/core/test/unit/services/apps/proxy_spec.js
index 87bc852e9e..d7b6cf1fd3 100644
--- a/core/test/unit/services/apps/proxy_spec.js
+++ b/core/test/unit/services/apps/proxy_spec.js
@@ -1,11 +1,9 @@
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
     helpers = require('../../../../server/helpers/register'),
     filters = require('../../../../server/filters'),
-
-    // Stuff we are testing
     AppProxy = require('../../../../server/services/apps/proxy'),
-
+    routing = require('../../../../server/services/routing'),
     sandbox = sinon.sandbox.create();
 
 describe('Apps', function () {
@@ -38,6 +36,10 @@ describe('Apps', function () {
                 add: sandbox.stub()
             }
         };
+
+        sandbox.stub(routing.registry, 'getRouter').withArgs('appRouter').returns({
+            mountRouter: sandbox.stub()
+        });
     });
 
     afterEach(function () {
diff --git a/core/test/unit/services/apps/sandbox_spec.js b/core/test/unit/services/apps/sandbox_spec.js
index 750387a52a..94f700a84a 100644
--- a/core/test/unit/services/apps/sandbox_spec.js
+++ b/core/test/unit/services/apps/sandbox_spec.js
@@ -1,11 +1,7 @@
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
     path = require('path'),
-
-    // Stuff we are testing
-    AppProxy = require('../../../../server/services/apps/proxy'),
     AppSandbox = require('../../../../server/services/apps/sandbox'),
-
     sandbox = sinon.sandbox.create();
 
 describe('Apps', function () {
@@ -22,10 +18,7 @@ describe('Apps', function () {
             var appBox = new AppSandbox(),
                 appPath = makeAppPath('good.js'),
                 GoodApp,
-                appProxy = new AppProxy({
-                    name: 'TestApp',
-                    permissions: {}
-                }),
+                appProxy = sandbox.stub(),
                 app;
 
             GoodApp = appBox.loadApp(appPath);
@@ -56,10 +49,7 @@ describe('Apps', function () {
             var appBox = new AppSandbox(),
                 badAppPath = makeAppPath('badinstall.js'),
                 BadApp,
-                appProxy = new AppProxy({
-                    name: 'TestApp',
-                    permissions: {}
-                }),
+                appProxy = sandbox.stub(),
                 app,
                 installApp = function () {
                     app.install(appProxy);
diff --git a/core/test/unit/services/channels/custom_channels_spec.js b/core/test/unit/services/channels/custom_channels_spec.js
deleted file mode 100644
index a5612b4f9c..0000000000
--- a/core/test/unit/services/channels/custom_channels_spec.js
+++ /dev/null
@@ -1,213 +0,0 @@
-var should = require('should'),
-    sinon = require('sinon'),
-    _ = require('lodash'),
-
-    // Stuff we are testing
-    channelLoader = require('../../../../server/services/channels/loader'),
-    channelsParentRouter = require('../../../../server/services/channels'),
-    channelUtils = require('../../../utils/channelUtils'),
-    Channel = channelUtils.Channel,
-
-    sandbox = sinon.sandbox.create();
-
-/**
- * These tests are a bit weird, because we are testing the express private API
- * Would be better to be testing our own internal API E.g. setupRSS.calledOnce, rather than router stack!
- *
- * This is partly because router_spec.js is testing a full stack of behaviour, including the loader
- * And we need to differentiate more between testing the default channels, and channels in general
- */
-describe('Custom Channels', function () {
-    var channelLoaderStub, channelsRouter, firstChannel, secondChannel, routeStack;
-
-    afterEach(function () {
-        sandbox.restore();
-    });
-
-    beforeEach(function () {
-        channelLoaderStub = sandbox.stub(channelLoader, 'list');
-    });
-
-    function getNewChannelsRouter() {
-        return channelsParentRouter.router();
-    }
-
-    it('allows basic custom config', function () {
-        channelLoaderStub.returns([new Channel('home', {route: '/home/'})]);
-
-        // Load the router
-        channelsRouter = getNewChannelsRouter();
-
-        channelsRouter.should.be.an.ExpressRouter({stackLength: 1});
-        firstChannel = channelsRouter.stack[0];
-        firstChannel.should.be.a.RouterLayer({
-            stackLength: 3,
-            regexp: /\\\/home\\\//,
-            params: {
-                key: 'page',
-                value: 'handlePageParam'
-            }
-        });
-
-        // The stack underneath our first channel router
-        routeStack = firstChannel.handle.stack;
-
-        // Layer 1 should be the handler for /
-        routeStack[0].should.be.a.DispatchLayer({
-            route: {
-                path: '/',
-                stack: ['doChannelConfig', 'channelController']
-            }
-        });
-
-        // Layer 2 should be the handler for pagination
-        routeStack[1].should.be.a.DispatchLayer({
-            keys: ['page'],
-            route: {
-                path: '/page/:page(\\d+)/',
-                stack: ['doChannelConfig', 'channelController']
-            }
-        });
-
-        // Layer 3 should be a whole new router for RSS
-        routeStack[2].should.be.an.RSSRouter();
-    });
-
-    it('allow multiple channels to be defined', function () {
-        channelLoaderStub.returns(
-            [
-                new Channel('home', {route: '/home/'}),
-                new Channel('featured', {
-                    route: '/featured/',
-                    postOptions: {
-                        filter: 'featured:true'
-                    }
-                })
-            ]);
-
-        // Load the router
-        channelsRouter = getNewChannelsRouter();
-
-        channelsRouter.should.be.an.ExpressRouter({stackLength: 2});
-        firstChannel = channelsRouter.stack[0];
-        secondChannel = channelsRouter.stack[1];
-        firstChannel.should.be.a.RouterLayer({
-            stackLength: 3,
-            regexp: /\\\/home\\\//,
-            params: {
-                key: 'page',
-                value: 'handlePageParam'
-            }
-        });
-
-        secondChannel.should.be.a.RouterLayer({
-            stackLength: 3,
-            regexp: /\\\/featured\\\//,
-            params: {
-                key: 'page',
-                value: 'handlePageParam'
-            }
-        });
-
-        // The stack underneath our first channel router
-        routeStack = secondChannel.handle.stack;
-
-        // Layer 1 should be the handler for /
-        routeStack[0].should.be.a.DispatchLayer({
-            route: {
-                path: '/',
-                stack: ['doChannelConfig', 'channelController']
-            }
-        });
-
-        // Layer 2 should be the handler for pagination
-        routeStack[1].should.be.a.DispatchLayer({
-            keys: ['page'],
-            route: {
-                path: '/page/:page(\\d+)/',
-                stack: ['doChannelConfig', 'channelController']
-            }
-        });
-
-        // Layer 3 should be a whole new router for RSS
-        routeStack[2].should.be.an.RSSRouter();
-    });
-
-    it('allows rss to be disabled', function () {
-        channelLoaderStub.returns([new Channel('home', {
-            route: '/home/',
-            rss: false
-        })]);
-
-        // Load the router
-        channelsRouter = getNewChannelsRouter();
-
-        channelsRouter.should.be.an.ExpressRouter({stackLength: 1});
-        firstChannel = channelsRouter.stack[0];
-        firstChannel.should.be.a.RouterLayer({
-            stackLength: 2,
-            regexp: /\\\/home\\\//,
-            params: {
-                key: 'page',
-                value: 'handlePageParam'
-            }
-        });
-
-        // The stack underneath our first channel router
-        routeStack = firstChannel.handle.stack;
-
-        // Layer 1 should be the handler for /
-        routeStack[0].should.be.a.DispatchLayer({
-            route: {
-                path: '/',
-                stack: ['doChannelConfig', 'channelController']
-            }
-        });
-
-        // Layer 2 should be the handler for pagination
-        routeStack[1].should.be.a.DispatchLayer({
-            keys: ['page'],
-            route: {
-                path: '/page/:page(\\d+)/',
-                stack: ['doChannelConfig', 'channelController']
-            }
-        });
-
-        // Layer 3 does not exist
-        should.not.exist(routeStack[2]);
-    });
-
-    it('allows pagination to be disabled', function () {
-        channelLoaderStub.returns([new Channel('home', {
-            route: '/home/',
-            paged: false
-        })]);
-
-        // Load the router
-        channelsRouter = getNewChannelsRouter();
-
-        channelsRouter.should.be.an.ExpressRouter({stackLength: 1});
-        firstChannel = channelsRouter.stack[0];
-        firstChannel.should.be.a.RouterLayer({
-            stackLength: 2,
-            regexp: /\\\/home\\\//
-        });
-
-        // The stack underneath our first channel router
-        routeStack = firstChannel.handle.stack;
-
-        // Layer 1 should be the handler for /
-        routeStack[0].should.be.a.DispatchLayer({
-            route: {
-                path: '/',
-                stack: ['doChannelConfig', 'channelController']
-            }
-        });
-
-        // Layer 2 should be the handler for /rss/
-        routeStack[1].should.be.an.RSSRouter();
-
-        // Layer 3 does not exist
-        should.not.exist(routeStack[2]);
-    });
-});
diff --git a/core/test/unit/services/channels/loader_spec.js b/core/test/unit/services/channels/loader_spec.js
deleted file mode 100644
index 93d65a4770..0000000000
--- a/core/test/unit/services/channels/loader_spec.js
+++ /dev/null
@@ -1,45 +0,0 @@
-var should = require('should'),
-    _ = require('lodash'),
-    rewire = require('rewire'),
-    channelUtils = require('../../../utils/channelUtils'),
-    channelLoader = rewire('../../../../server/services/channels/loader');
-
-describe('Channels', function () {
-    describe('Loader', function () {
-        // This is a bit of a weird test. because the loader functionality is TEMPORARY
-        // If you have a local config, that gets loaded instead of the default.
-        // This just tests that either way, we get a JSON object.
-        it('should load a JSON object', function () {
-            var loadConfig = channelLoader.__get__('loadConfig'),
-                result = loadConfig();
-
-            result.should.be.an.Object();
-        });
-    });
-
-    describe('Default config', function () {
-        var channelReset;
-
-        before(function () {
-            // Change the channels we get returned
-            channelReset = channelLoader.__set__('loadConfig', function () {
-                return channelUtils.getDefaultChannels();
-            });
-        });
-
-        after(function () {
-            channelReset();
-        });
-
-        it('[default] list() should return a list of channel objects', function () {
-            var channels = channelLoader.list();
-            channels.should.be.an.Array().with.lengthOf(3);
-
-            _.map(channels, 'name').should.eql(['index', 'tag', 'author']);
-
-            _.each(channels, function (channel) {
-                channel.should.be.a.Channel();
-            });
-        });
-    });
-});
diff --git a/core/test/unit/services/channels/parent-router_spec.js b/core/test/unit/services/channels/parent-router_spec.js
deleted file mode 100644
index 8e1d4fbaf3..0000000000
--- a/core/test/unit/services/channels/parent-router_spec.js
+++ /dev/null
@@ -1,500 +0,0 @@
-var should = require('should'),
-    sinon = require('sinon'),
-    Promise = require('bluebird'),
-    _ = require('lodash'),
-
-    // Stuff we are testing
-    channelsParentRouter = require('../../../../server/services/channels'),
-    api = require('../../../../server/api'),
-    themes = require('../../../../server/services/themes'),
-    sandbox = sinon.sandbox.create();
-
-/**
- * Note: this tests the following all in one go:
- * - ChannelS Router services/route/channels-router.js
- * - Channel Router services/channel/router.js
- * - Channel Controller controllers/channel.js
- * - Channel Renderer controllers/frontend/render-channel.js
- * This is because the refactor is in progress!
- */
-describe('Channels', function () {
-    var channelsRouter, req, res, hasTemplateStub, themeConfigStub;
-
-    // Initialise 'req' with the bare minimum properties
-    function setupRequest() {
-        req = {
-            method: 'get'
-        };
-    }
-
-    // Prevent unit tests from failing via timeout when they should just immediately fail
-    function failTest(done) {
-        return function (err) {
-            done(err || 'Next was called with no Error');
-        };
-    }
-
-    // Run a test which should result in a render
-    function testChannelRender(props, assertions, done) {
-        res = {
-            redirect: sandbox.spy(),
-            locals: {
-                // Fake the ghost locals middleware, which doesn't happen when calling a channel router directly
-                relativeUrl: props.url
-            }
-        };
-
-        res.render = function (view, data) {
-            try {
-                assertions.call(this, view, data);
-                res.redirect.called.should.be.false();
-                done();
-            } catch (err) {
-                done(err);
-            }
-        };
-
-        _.extend(req, props);
-
-        channelsRouter(req, res, failTest(done));
-    }
-
-    // Run a test which should result in a redirect
-    function testChannelRedirect(props, assertions, done) {
-        res = {
-            render: sandbox.spy(),
-            set: sandbox.spy(),
-            locals: {
-                // Fake the ghost locals middleware, which doesn't happen when calling a channel router directly
-                relativeUrl: props.url
-            }
-        };
-
-        res.redirect = function (status, path) {
-            try {
-                assertions.call(this, status, path);
-                res.render.called.should.be.false();
-                done();
-            } catch (err) {
-                done(err);
-            }
-        };
-
-        _.extend(req, props);
-
-        channelsRouter(req, res, failTest(done));
-    }
-
-    // Run a test which should result in next() being called
-    function testChannelNext(props, assertions, done) {
-        res = {
-            redirect: sandbox.spy(),
-            render: sandbox.spy(),
-            set: sandbox.spy(),
-            locals: {
-                // Fake the ghost locals middleware, which doesn't happen when calling a channel router directly
-                relativeUrl: props.url
-            }
-        };
-
-        _.extend(req, props);
-
-        channelsRouter(req, res, function (empty) {
-            try {
-                assertions.call(this, empty);
-                res.redirect.called.should.be.false();
-                res.render.called.should.be.false();
-                done();
-            } catch (err) {
-                done(err);
-            }
-        });
-    }
-
-    // Run a test which results in next being called with an error
-    function testChannelError(props, assertions, done) {
-        testChannelNext(props, function (error) {
-            should.exist(error);
-            assertions(error);
-        }, done);
-    }
-
-    // Run a test which results in an explicit 404
-    function testChannel404(props, done) {
-        testChannelError(props, function (error) {
-            error.errorType.should.eql('NotFoundError');
-            error.statusCode.should.eql(404);
-        }, done);
-    }
-
-    // Ensure hasTemplate returns values
-    function setupActiveTheme() {
-        hasTemplateStub = sandbox.stub().returns(false);
-        hasTemplateStub.withArgs('index').returns(true);
-
-        themeConfigStub = sandbox.stub().withArgs('posts_per_page').returns(5);
-
-        sandbox.stub(themes, 'getActive').returns({
-            hasTemplate: hasTemplateStub,
-            config: themeConfigStub
-        });
-    }
-
-    before(function () {
-        // We don't overwrite this, so only do it once
-        channelsRouter = channelsParentRouter.router();
-    });
-
-    afterEach(function () {
-        sandbox.restore();
-    });
-
-    describe('Index', function () {
-        var postAPIStub;
-
-        // Stub the posts api
-        function setupPostsAPIStub() {
-            postAPIStub = sandbox.stub(api.posts, 'browse').callsFake(function () {
-                return Promise.resolve({posts: [{}], meta: {pagination: {pages: 3}}});
-            });
-        }
-
-        beforeEach(function () {
-            // Setup Env for tests
-            setupPostsAPIStub();
-            setupActiveTheme();
-            setupRequest();
-        });
-
-        it('should render the first page of the index channel', function (done) {
-            testChannelRender({url: '/'}, function (view) {
-                should.exist(view);
-                view.should.eql('index');
-
-                should.exist(this.locals);
-                this.locals.should.have.property('context').which.is.an.Array();
-                this.locals.context.should.containEql('index');
-
-                postAPIStub.calledOnce.should.be.true();
-                postAPIStub.calledWith({page: 1, limit: 5, include: 'author,authors,tags'}).should.be.true();
-            }, done);
-        });
-
-        it('should render the first page of the index channel using home.hbs if available', function (done) {
-            hasTemplateStub.withArgs('home').returns(true);
-
-            testChannelRender({url: '/'}, function (view) {
-                should.exist(view);
-                view.should.eql('home');
-
-                should.exist(this.locals);
-                this.locals.should.have.property('context').which.is.an.Array();
-                this.locals.context.should.containEql('index');
-
-                postAPIStub.calledOnce.should.be.true();
-                postAPIStub.calledWith({page: 1, limit: 5, include: 'author,authors,tags'}).should.be.true();
-            }, done);
-        });
-
-        describe('Paged', function () {
-            it('should render the second page of the index channel', function (done) {
-                testChannelRender({url: '/page/2/'}, function (view) {
-                    should.exist(view);
-                    view.should.eql('index');
-
-                    should.exist(this.locals);
-                    this.locals.should.have.property('context').which.is.an.Array();
-                    this.locals.context.should.containEql('index');
-
-                    postAPIStub.calledOnce.should.be.true();
-                    postAPIStub.calledWith({page: 2, limit: 5, include: 'author,authors,tags'}).should.be.true();
-                }, done);
-            });
-
-            it('should use index.hbs for second page even if home.hbs is available', function (done) {
-                testChannelRender({url: '/page/2/'}, function (view) {
-                    should.exist(view);
-                    view.should.eql('index');
-
-                    should.exist(this.locals);
-                    this.locals.should.have.property('context').which.is.an.Array();
-                    this.locals.context.should.containEql('index');
-
-                    postAPIStub.calledOnce.should.be.true();
-                    postAPIStub.calledWith({page: 2, limit: 5, include: 'author,authors,tags'}).should.be.true();
-                }, done);
-            });
-
-            it('should render the third page of the index channel', function (done) {
-                testChannelRender({url: '/page/3/'}, function (view) {
-                    should.exist(view);
-                    view.should.eql('index');
-
-                    should.exist(this.locals);
-                    this.locals.should.have.property('context').which.is.an.Array();
-                    this.locals.context.should.containEql('index');
-
-                    postAPIStub.calledOnce.should.be.true();
-                    postAPIStub.calledWith({page: 3, limit: 5, include: 'author,authors,tags'}).should.be.true();
-                }, done);
-            });
-
-            it('should redirect /page/1/ to /', function (done) {
-                testChannelRedirect({url: '/page/1/'}, function (status, path) {
-                    status.should.eql(301);
-                    path.should.eql('/');
-
-                    res.set.called.should.be.true();
-                    postAPIStub.called.should.be.false();
-                }, done);
-            });
-
-            it('should 404 for /page/0/', function (done) {
-                testChannel404({url: '/page/0/'}, done);
-            });
-
-            it('should 404 for /page/4/', function (done) {
-                testChannel404({url: '/page/4/'}, done);
-            });
-        });
-
-        describe('RSS', function () {
-            it('should redirect /feed/ to /rss/', function (done) {
-                testChannelRedirect({url: '/feed/'}, function (status, path) {
-                    status.should.eql(301);
-                    path.should.eql('/rss/');
-
-                    res.set.called.should.be.true();
-                    postAPIStub.called.should.be.false();
-                }, done);
-            });
-
-            it('should redirect /rss/1/ to /rss/', function (done) {
-                testChannelRedirect({url: '/rss/1/'}, function (status, path) {
-                    status.should.eql(301);
-                    path.should.eql('/rss/');
-
-                    res.set.called.should.be.true();
-                    postAPIStub.called.should.be.false();
-                }, done);
-            });
-
-            it('should 404 for /rss/0/', function (done) {
-                testChannel404({url: '/rss/0/'}, done);
-            });
-
-            it('should 404 for /rss/4/', function (done) {
-                testChannel404({url: '/rss/4/'}, done);
-            });
-        });
-
-        describe('Edit', function () {
-            it('should NOT redirect /edit/, should pass through', function (done) {
-                testChannelNext({url: '/edit/'}, done);
-            });
-        });
-    });
-
-    describe('Tag', function () {
-        var postAPIStub, tagAPIStub;
-
-        // Stub the posts and tags api
-        function setupAPIStubs() {
-            postAPIStub = sandbox.stub(api.posts, 'browse').callsFake(function () {
-                return Promise.resolve({posts: [{}], meta: {pagination: {pages: 3}}});
-            });
-
-            tagAPIStub = sandbox.stub(api.tags, 'read').callsFake(function () {
-                return Promise.resolve({tags: [{}]});
-            });
-        }
-
-        beforeEach(function () {
-            // Setup Env for tests
-            setupAPIStubs();
-            setupActiveTheme();
-            setupRequest();
-        });
-
-        it('should render the first page of the tag channel using index.hbs by default', function (done) {
-            testChannelRender({url: '/tag/my-tag/'}, function (view) {
-                should.exist(view);
-                view.should.eql('index');
-
-                should.exist(this.locals);
-                this.locals.should.have.property('context').which.is.an.Array();
-                this.locals.context.should.containEql('tag');
-
-                postAPIStub.calledOnce.should.be.true();
-                postAPIStub.calledWith({filter: 'tags:\'my-tag\'+tags.visibility:public', page: 1, limit: 5, include: 'author,authors,tags'}).should.be.true();
-                tagAPIStub.calledOnce.should.be.true();
-                tagAPIStub.calledWith({slug: 'my-tag', visibility: 'public'}).should.be.true();
-            }, done);
-        });
-
-        it('should render the first page of the tag channel using tag.hbs by default', function (done) {
-            hasTemplateStub.withArgs('tag').returns(true);
-
-            testChannelRender({url: '/tag/my-tag/'}, function (view) {
-                should.exist(view);
-                view.should.eql('tag');
-
-                should.exist(this.locals);
-                this.locals.should.have.property('context').which.is.an.Array();
-                this.locals.context.should.containEql('tag');
-
-                postAPIStub.calledOnce.should.be.true();
-                postAPIStub.calledWith({filter: 'tags:\'my-tag\'+tags.visibility:public', page: 1, limit: 5, include: 'author,authors,tags'}).should.be.true();
-                tagAPIStub.calledOnce.should.be.true();
-                tagAPIStub.calledWith({slug: 'my-tag', visibility: 'public'}).should.be.true();
-            }, done);
-        });
-
-        it('should render the first page of the tag channel using tag-:slug.hbs if available', function (done) {
-            hasTemplateStub.withArgs('tag').returns(true);
-            hasTemplateStub.withArgs('tag-my-tag').returns(true);
-
-            testChannelRender({url: '/tag/my-tag/'}, function (view) {
-                should.exist(view);
-                view.should.eql('tag-my-tag');
-
-                should.exist(this.locals);
-                this.locals.should.have.property('context').which.is.an.Array();
-                this.locals.context.should.containEql('tag');
-
-                postAPIStub.calledOnce.should.be.true();
-                postAPIStub.calledWith({filter: 'tags:\'my-tag\'+tags.visibility:public', page: 1, limit: 5, include: 'author,authors,tags'}).should.be.true();
-                tagAPIStub.calledOnce.should.be.true();
-                tagAPIStub.calledWith({slug: 'my-tag', visibility: 'public'}).should.be.true();
-            }, done);
-        });
-
-        describe('Paged', function () {
-            it('should render the second page of the tag channel', function (done) {
-                testChannelRender({url: '/tag/my-tag/page/2/'}, function (view) {
-                    should.exist(view);
-                    view.should.eql('index');
-                    postAPIStub.calledOnce.should.be.true();
-                }, done);
-            });
-
-            it('should use tag.hbs to render the tag channel if available', function (done) {
-                hasTemplateStub.withArgs('tag').returns(true);
-
-                testChannelRender({url: '/tag/my-tag/page/2/'}, function (view) {
-                    should.exist(view);
-                    view.should.eql('tag');
-
-                    should.exist(this.locals);
-                    this.locals.should.have.property('context').which.is.an.Array();
-                    this.locals.context.should.containEql('tag');
-
-                    postAPIStub.calledOnce.should.be.true();
-                    postAPIStub.calledWith({filter: 'tags:\'my-tag\'+tags.visibility:public', page: 2, limit: 5, include: 'author,authors,tags'}).should.be.true();
-                    tagAPIStub.calledOnce.should.be.true();
-                    tagAPIStub.calledWith({slug: 'my-tag', visibility: 'public'}).should.be.true();
-                }, done);
-            });
-
-            it('should use tag-:slug.hbs to render the tag channel if available', function (done) {
-                hasTemplateStub.withArgs('tag').returns(true);
-                hasTemplateStub.withArgs('tag-my-tag').returns(true);
-
-                testChannelRender({url: '/tag/my-tag/page/2/'}, function (view) {
-                    should.exist(view);
-                    view.should.eql('tag-my-tag');
-
-                    should.exist(this.locals);
-                    this.locals.should.have.property('context').which.is.an.Array();
-                    this.locals.context.should.containEql('tag');
-
-                    postAPIStub.calledOnce.should.be.true();
-                    postAPIStub.calledWith({filter: 'tags:\'my-tag\'+tags.visibility:public', page: 2, limit: 5, include: 'author,authors,tags'}).should.be.true();
-                    tagAPIStub.calledOnce.should.be.true();
-                    tagAPIStub.calledWith({slug: 'my-tag', visibility: 'public'}).should.be.true();
-                }, done);
-            });
-
-            it('should render the second page of the tag channel', function (done) {
-                testChannelRender({url: '/tag/my-tag/page/2/'}, function (view) {
-                    should.exist(view);
-                    view.should.eql('index');
-                    postAPIStub.calledOnce.should.be.true();
-                }, done);
-            });
-
-            it('should render the third page of the tag channel', function (done) {
-                testChannelRender({url: '/tag/my-tag/page/3/'}, function (view) {
-                    should.exist(view);
-                    view.should.eql('index');
-
-                    should.exist(this.locals);
-                    this.locals.should.have.property('context').which.is.an.Array();
-                    this.locals.context.should.containEql('tag');
-
-                    postAPIStub.calledOnce.should.be.true();
-                    postAPIStub.calledWith({filter: 'tags:\'my-tag\'+tags.visibility:public', page: 3, limit: 5, include: 'author,authors,tags'}).should.be.true();
-                    tagAPIStub.calledOnce.should.be.true();
-                    tagAPIStub.calledWith({slug: 'my-tag', visibility: 'public'}).should.be.true();
-                }, done);
-            });
-
-            it('should redirect /tag/my-tag/page/1/ to /tag/my-tag/', function (done) {
-                testChannelRedirect({url: '/tag/my-tag/page/1/'}, function (status, path) {
-                    status.should.eql(301);
-                    path.should.eql('/tag/my-tag/');
-
-                    res.set.called.should.be.true();
-                    postAPIStub.called.should.be.false();
-                }, done);
-            });
-
-            it('should 404 for /tag/my-tag/page/0/', function (done) {
-                testChannel404({url: '/tag/my-tag/page/0/'}, done);
-            });
-
-            it('should 404 for /tag/my-tag/page/4/', function (done) {
-                testChannel404({url: '/tag/my-tag/page/4/'}, done);
-            });
-        });
-
-        describe('RSS', function () {
-            it('should redirect /tag/my-tag/feed/ to /tag/my-tag/rss/', function (done) {
-                testChannelRedirect({url: '/tag/my-tag/feed/'}, function (status, path) {
-                    status.should.eql(301);
-                    path.should.eql('/tag/my-tag/rss/');
-
-                    res.set.called.should.be.true();
-                    postAPIStub.called.should.be.false();
-                }, done);
-            });
-
-            it('should redirect /tag/my-tag/rss/1/ to /tag/my-tag/rss/', function (done) {
-                testChannelRedirect({url: '/tag/my-tag/rss/1/'}, function (status, path) {
-                    status.should.eql(301);
-                    path.should.eql('/tag/my-tag/rss/');
-
-                    res.set.called.should.be.true();
-                    postAPIStub.called.should.be.false();
-                }, done);
-            });
-
-            it('should 404 for /tag/my-tag/rss/0/', function (done) {
-                testChannel404({url: '/tag/my-tag/rss/0/'}, done);
-            });
-
-            it('should 404 for /tag/my-tag/rss/4/', function (done) {
-                testChannel404({url: '/tag/my-tag/rss/4/'}, done);
-            });
-        });
-
-        describe('Edit', function () {
-            it('should redirect /edit/ to ghost admin', function (done) {
-                testChannelRedirect({url: '/tag/my-tag/edit/'}, function (path) {
-                    path.should.eql('/ghost/#/settings/tags/my-tag/');
-                    postAPIStub.called.should.be.false();
-                }, done);
-            });
-        });
-    });
-});
diff --git a/core/test/unit/services/routing/CollectionRouter_spec.js b/core/test/unit/services/routing/CollectionRouter_spec.js
new file mode 100644
index 0000000000..d62f7bae3f
--- /dev/null
+++ b/core/test/unit/services/routing/CollectionRouter_spec.js
@@ -0,0 +1,157 @@
+const should = require('should'),
+    sinon = require('sinon'),
+    settingsCache = require('../../../../server/services/settings/cache'),
+    common = require('../../../../server/lib/common'),
+    controllers = require('../../../../server/services/routing/controllers'),
+    CollectionRouter = require('../../../../server/services/routing/CollectionRouter'),
+    sandbox = sinon.sandbox.create();
+
+describe('UNIT - services/routing/CollectionRouter', function () {
+    describe('instantiate', function () {
+        beforeEach(function () {
+            sandbox.stub(settingsCache, 'get').withArgs('permalinks').returns('/:slug/');
+
+            sandbox.stub(common.events, 'emit');
+            sandbox.stub(common.events, 'on');
+
+            sandbox.spy(CollectionRouter.prototype, 'mountRoute');
+            sandbox.spy(CollectionRouter.prototype, 'mountRouter');
+        });
+
+        afterEach(function () {
+            sandbox.restore();
+        });
+
+        it('default', function () {
+            const collectionRouter = new CollectionRouter('/', {permalink: '/:slug/'});
+
+            should.exist(collectionRouter.router);
+
+            collectionRouter.getFilter().should.eql('page:false');
+            collectionRouter.getType().should.eql('posts');
+            collectionRouter.templates.should.eql([]);
+            collectionRouter.getPermalinks().getValue().should.eql('/:slug/');
+
+            common.events.emit.calledOnce.should.be.true();
+            common.events.emit.calledWith('router.created', collectionRouter).should.be.true();
+
+            common.events.on.called.should.be.false();
+
+            collectionRouter.mountRoute.callCount.should.eql(3);
+
+            // parent route
+            collectionRouter.mountRoute.args[0][0].should.eql('/');
+            collectionRouter.mountRoute.args[0][1].should.eql(controllers.collection);
+
+            // pagination feature
+            collectionRouter.mountRoute.args[1][0].should.eql('/page/:page(\\d+)');
+            collectionRouter.mountRoute.args[1][1].should.eql(controllers.collection);
+
+            // permalinks
+            collectionRouter.mountRoute.args[2][0].should.eql('/:slug/:options(edit)?/');
+            collectionRouter.mountRoute.args[2][1].should.eql(controllers.entry);
+
+            collectionRouter.mountRouter.callCount.should.eql(1);
+            collectionRouter.mountRouter.args[0][0].should.eql('/');
+            collectionRouter.mountRouter.args[0][1].should.eql(collectionRouter.rssRouter.router());
+        });
+
+        it('collection lives under /blog/', function () {
+            const collectionRouter = new CollectionRouter('/blog/', {permalink: '/blog/:year/:slug/'});
+
+            should.exist(collectionRouter.router);
+
+            collectionRouter.getFilter().should.eql('page:false');
+            collectionRouter.getType().should.eql('posts');
+            collectionRouter.templates.should.eql([]);
+            collectionRouter.getPermalinks().getValue().should.eql('/blog/:year/:slug/');
+
+            common.events.emit.calledOnce.should.be.true();
+            common.events.emit.calledWith('router.created', collectionRouter).should.be.true();
+
+            common.events.on.called.should.be.false();
+
+            collectionRouter.mountRoute.callCount.should.eql(3);
+
+            // parent route
+            collectionRouter.mountRoute.args[0][0].should.eql('/blog/');
+            collectionRouter.mountRoute.args[0][1].should.eql(controllers.collection);
+
+            // pagination feature
+            collectionRouter.mountRoute.args[1][0].should.eql('/blog/page/:page(\\d+)');
+            collectionRouter.mountRoute.args[1][1].should.eql(controllers.collection);
+
+            // permalinks
+            collectionRouter.mountRoute.args[2][0].should.eql('/blog/:year/:slug/:options(edit)?/');
+            collectionRouter.mountRoute.args[2][1].should.eql(controllers.entry);
+
+            collectionRouter.mountRouter.callCount.should.eql(1);
+            collectionRouter.mountRouter.args[0][0].should.eql('/blog/');
+            collectionRouter.mountRouter.args[0][1].should.eql(collectionRouter.rssRouter.router());
+        });
+
+        it('with custom filter', function () {
+            const collectionRouter = new CollectionRouter('/', {permalink: '/:slug/', filter: 'featured:true'});
+
+            collectionRouter.getFilter().should.eql('featured:true');
+        });
+
+        it('permalink placeholder', function () {
+            const collectionRouter = new CollectionRouter('/magic/', {permalink: '/magic/{globals.permalinks}/'});
+
+            collectionRouter.getPermalinks().getValue().should.eql('/magic/:slug/');
+            common.events.on.calledOnce.should.be.true();
+        });
+
+        it('permalink placeholder', function () {
+            const collectionRouter = new CollectionRouter('/magic/', {permalink: '{globals.permalinks}'});
+
+            collectionRouter.getPermalinks().getValue().should.eql('/:slug/');
+        });
+    });
+
+    describe('permalink in database changes', function () {
+        beforeEach(function () {
+            sandbox.stub(settingsCache, 'get').withArgs('permalinks').returns('/:slug/');
+
+            sandbox.stub(common.events, 'emit');
+            sandbox.stub(common.events, 'on');
+
+            sandbox.spy(CollectionRouter.prototype, 'mountRoute');
+            sandbox.spy(CollectionRouter.prototype, 'unmountRoute');
+        });
+
+        afterEach(function () {
+            sandbox.restore();
+        });
+
+        it('permalink placeholder: flat', function () {
+            const collectionRouter = new CollectionRouter('/magic/', {permalink: '{globals.permalinks}'});
+
+            collectionRouter.mountRoute.callCount.should.eql(3);
+            collectionRouter.unmountRoute.callCount.should.eql(0);
+
+            collectionRouter.getPermalinks().getValue().should.eql('/:slug/');
+
+            settingsCache.get.withArgs('permalinks').returns('/:primary_author/:slug/');
+
+            common.events.on.args[0][1]();
+
+            collectionRouter.mountRoute.callCount.should.eql(4);
+            collectionRouter.unmountRoute.callCount.should.eql(1);
+
+            collectionRouter.getPermalinks().getValue().should.eql('/:primary_author/:slug/');
+        });
+
+        it('permalink placeholder: complex', function () {
+            const collectionRouter = new CollectionRouter('/animals/', {permalink: '/animals/{globals.permalinks}/'});
+
+            collectionRouter.getPermalinks().getValue().should.eql('/animals/:slug/');
+            settingsCache.get.withArgs('permalinks').returns('/:primary_author/:slug/');
+
+            common.events.on.args[0][1]();
+
+            collectionRouter.getPermalinks().getValue().should.eql('/animals/:primary_author/:slug/');
+        });
+    });
+});
diff --git a/core/test/unit/services/routing/RSSRouter_spec.js b/core/test/unit/services/routing/RSSRouter_spec.js
new file mode 100644
index 0000000000..5b8dec797c
--- /dev/null
+++ b/core/test/unit/services/routing/RSSRouter_spec.js
@@ -0,0 +1,72 @@
+const should = require('should'),
+    sinon = require('sinon'),
+    configUtils = require('../../../utils/configUtils'),
+    common = require('../../../../server/lib/common'),
+    controllers = require('../../../../server/services/routing/controllers'),
+    RSSRouter = require('../../../../server/services/routing/RSSRouter'),
+    urlService = require('../../../../server/services/url'),
+    sandbox = sinon.sandbox.create();
+
+describe('UNIT - services/routing/RSSRouter', function () {
+    describe('instantiate', function () {
+        beforeEach(function () {
+            sandbox.stub(common.events, 'emit');
+            sandbox.stub(common.events, 'on');
+
+            sandbox.spy(RSSRouter.prototype, 'mountRoute');
+            sandbox.spy(RSSRouter.prototype, 'mountRouter');
+
+            sandbox.stub(urlService.utils, 'urlJoin');
+        });
+
+        afterEach(function () {
+            sandbox.restore();
+            configUtils.restore();
+        });
+
+        it('default', function () {
+            urlService.utils.urlJoin.withArgs('/rss/', ':page(\\d+)').returns('/rss-pagination/');
+
+            const rssRouter = new RSSRouter();
+
+            should.exist(rssRouter.router);
+            rssRouter.route.value.should.eql('/rss/');
+
+            common.events.emit.calledOnce.should.be.false();
+            common.events.on.calledOnce.should.be.false();
+
+            rssRouter.mountRoute.callCount.should.eql(3);
+
+            rssRouter.mountRoute.args[0][0].should.eql('/rss/');
+            rssRouter.mountRoute.args[0][1].should.eql(controllers.rss);
+
+            rssRouter.mountRoute.args[1][0].should.eql('/rss-pagination/');
+            rssRouter.mountRoute.args[1][1].should.eql(controllers.rss);
+
+            rssRouter.mountRoute.args[2][0].should.eql('/feed/');
+        });
+
+        it('subdirectory is enabled', function () {
+            configUtils.set('url', 'http://localhost:22222/blog/');
+            urlService.utils.urlJoin.withArgs('/rss/', ':page(\\d+)').returns('/rss-pagination/');
+
+            const rssRouter = new RSSRouter();
+
+            should.exist(rssRouter.router);
+            rssRouter.route.value.should.eql('/rss/');
+
+            common.events.emit.calledOnce.should.be.false();
+            common.events.on.calledOnce.should.be.false();
+
+            rssRouter.mountRoute.callCount.should.eql(3);
+
+            rssRouter.mountRoute.args[0][0].should.eql('/rss/');
+            rssRouter.mountRoute.args[0][1].should.eql(controllers.rss);
+
+            rssRouter.mountRoute.args[1][0].should.eql('/rss-pagination/');
+            rssRouter.mountRoute.args[1][1].should.eql(controllers.rss);
+
+            rssRouter.mountRoute.args[2][0].should.eql('/feed/');
+        });
+    });
+});
diff --git a/core/test/unit/services/routing/controllers/collection_spec.js b/core/test/unit/services/routing/controllers/collection_spec.js
new file mode 100644
index 0000000000..14da68710e
--- /dev/null
+++ b/core/test/unit/services/routing/controllers/collection_spec.js
@@ -0,0 +1,236 @@
+const should = require('should'),
+    sinon = require('sinon'),
+    testUtils = require('../../../../utils'),
+    common = require('../../../../../server/lib/common'),
+    security = require('../../../../../server/lib/security'),
+    filters = require('../../../../../server/filters'),
+    themeService = require('../../../../../server/services/themes'),
+    urlService = require('../../../../../server/services/url'),
+    controllers = require('../../../../../server/services/routing/controllers'),
+    helpers = require('../../../../../server/services/routing/helpers'),
+    sandbox = sinon.sandbox.create();
+
+function failTest(done) {
+    return function (err) {
+        should.exist(err);
+        done(err);
+    };
+}
+
+describe('Unit - services/routing/controllers/collection', function () {
+    let req, res, fetchDataStub, secureStub, renderStub, posts, postsPerPage;
+
+    beforeEach(function () {
+        postsPerPage = 5;
+
+        posts = [
+            testUtils.DataGenerator.forKnex.createPost()
+        ];
+
+        secureStub = sandbox.stub();
+        fetchDataStub = sandbox.stub();
+        renderStub = sandbox.stub();
+
+        sandbox.stub(helpers, 'fetchData').get(function () {
+            return fetchDataStub;
+        });
+
+        sandbox.stub(security.string, 'safe').returns('safe');
+
+        sandbox.stub(helpers, 'secure').get(function () {
+            return secureStub;
+        });
+
+        sandbox.stub(themeService, 'getActive').returns({
+            config: function (key) {
+               key.should.eql('posts_per_page');
+               return postsPerPage;
+           }
+        });
+
+        sandbox.stub(helpers, 'renderCollection').get(function () {
+            return renderStub;
+        });
+
+        sandbox.stub(filters, 'doFilter');
+
+        req = {
+            path: '/',
+            params: {},
+            route: {}
+        };
+
+        res = {
+            locals: {
+                routerOptions: {}
+            },
+            render: sinon.spy(),
+            redirect: sinon.spy()
+        };
+    });
+
+    afterEach(function () {
+        sandbox.restore();
+    });
+
+    it('no params', function (done) {
+        fetchDataStub.withArgs({page: 1, slug: undefined, limit: postsPerPage}, res.locals.routerOptions)
+            .resolves({
+                posts: posts,
+                meta: {
+                    pagination: {
+                        pages: 5
+                    }
+                }
+            });
+
+        filters.doFilter.withArgs('prePostsRender', posts, res.locals).resolves();
+
+        renderStub.callsFake(function () {
+            themeService.getActive.calledOnce.should.be.true();
+            security.string.safe.calledOnce.should.be.false();
+            fetchDataStub.calledOnce.should.be.true();
+            filters.doFilter.calledOnce.should.be.true();
+            secureStub.calledOnce.should.be.true();
+            done();
+        });
+
+        controllers.collection(req, res, failTest(done));
+    });
+
+    it('pass page param', function (done) {
+        req.params.page = 2;
+
+        fetchDataStub.withArgs({page: 2, slug: undefined, limit: postsPerPage}, res.locals.routerOptions)
+            .resolves({
+                posts: posts,
+                meta: {
+                    pagination: {
+                        pages: 5
+                    }
+                }
+            });
+
+        filters.doFilter.withArgs('prePostsRender', posts, res.locals).resolves();
+
+        renderStub.callsFake(function () {
+            themeService.getActive.calledOnce.should.be.true();
+            security.string.safe.calledOnce.should.be.false();
+            fetchDataStub.calledOnce.should.be.true();
+            filters.doFilter.calledOnce.should.be.true();
+            secureStub.calledOnce.should.be.true();
+            done();
+        });
+
+        controllers.collection(req, res, failTest(done));
+    });
+
+    it('page param too big', function (done) {
+        req.params.page = 6;
+
+        fetchDataStub.withArgs({page: 6, slug: undefined, limit: postsPerPage}, res.locals.routerOptions)
+            .resolves({
+                posts: posts,
+                meta: {
+                    pagination: {
+                        pages: 5
+                    }
+                }
+            });
+
+        controllers.collection(req, res, function (err) {
+            (err instanceof common.errors.NotFoundError).should.be.true();
+
+            themeService.getActive.calledOnce.should.be.true();
+            security.string.safe.calledOnce.should.be.false();
+            fetchDataStub.calledOnce.should.be.true();
+            filters.doFilter.calledOnce.should.be.false();
+            renderStub.calledOnce.should.be.false();
+            secureStub.calledOnce.should.be.false();
+
+            done();
+        });
+    });
+
+    it('slug param', function (done) {
+        req.params.slug = 'unsafe';
+
+        fetchDataStub.withArgs({page: 1, slug: 'safe', limit: postsPerPage}, res.locals.routerOptions)
+            .resolves({
+                posts: posts,
+                meta: {
+                    pagination: {
+                        pages: 5
+                    }
+                }
+            });
+
+        filters.doFilter.withArgs('prePostsRender', posts, res.locals).resolves();
+
+        renderStub.callsFake(function () {
+            themeService.getActive.calledOnce.should.be.true();
+            security.string.safe.calledOnce.should.be.true();
+            fetchDataStub.calledOnce.should.be.true();
+            filters.doFilter.calledOnce.should.be.true();
+            secureStub.calledOnce.should.be.true();
+            done();
+        });
+
+        controllers.collection(req, res, failTest(done));
+    });
+
+    it('invalid posts per page', function (done) {
+        postsPerPage = -1;
+
+        fetchDataStub.withArgs({page: 1, slug: undefined}, res.locals.routerOptions)
+            .resolves({
+                posts: posts,
+                meta: {
+                    pagination: {
+                        pages: 5
+                    }
+                }
+            });
+
+        filters.doFilter.withArgs('prePostsRender', posts, res.locals).resolves();
+
+        renderStub.callsFake(function () {
+            themeService.getActive.calledOnce.should.be.true();
+            security.string.safe.calledOnce.should.be.false();
+            fetchDataStub.calledOnce.should.be.true();
+            filters.doFilter.calledOnce.should.be.true();
+            secureStub.calledOnce.should.be.true();
+            done();
+        });
+
+        controllers.collection(req, res, failTest(done));
+    });
+
+    it('ensure secure helper get\'s called for data object', function (done) {
+        fetchDataStub.withArgs({page: 1, slug: undefined, limit: postsPerPage}, res.locals.routerOptions)
+            .resolves({
+                posts: posts,
+                data: {
+                    tag: [testUtils.DataGenerator.forKnex.createTag()]
+                },
+                meta: {
+                    pagination: {
+                        pages: 5
+                    }
+                }
+            });
+
+        filters.doFilter.withArgs('prePostsRender', posts, res.locals).resolves();
+
+        renderStub.callsFake(function () {
+            themeService.getActive.calledOnce.should.be.true();
+            security.string.safe.calledOnce.should.be.false();
+            fetchDataStub.calledOnce.should.be.true();
+            filters.doFilter.calledOnce.should.be.true();
+            secureStub.calledTwice.should.be.true();
+            done();
+        });
+
+        controllers.collection(req, res, failTest(done));
+    });
+});
diff --git a/core/test/unit/services/routing/controllers/entry_spec.js b/core/test/unit/services/routing/controllers/entry_spec.js
new file mode 100644
index 0000000000..318bce9283
--- /dev/null
+++ b/core/test/unit/services/routing/controllers/entry_spec.js
@@ -0,0 +1,181 @@
+const should = require('should'),
+    sinon = require('sinon'),
+    testUtils = require('../../../../utils'),
+    filters = require('../../../../../server/filters'),
+    urlService = require('../../../../../server/services/url'),
+    controllers = require('../../../../../server/services/routing/controllers'),
+    helpers = require('../../../../../server/services/routing/helpers'),
+    sandbox = sinon.sandbox.create(),
+    EDITOR_URL = '/editor/';
+
+describe('Unit - services/routing/controllers/entry', function () {
+    let req, res, postLookUpStub, secureStub, renderStub, post, page;
+
+    beforeEach(function () {
+        post = testUtils.DataGenerator.forKnex.createPost();
+        post.url = '/does-exist/';
+
+        page = testUtils.DataGenerator.forKnex.createPost({page: 1});
+
+        secureStub = sandbox.stub();
+        postLookUpStub = sandbox.stub();
+        renderStub = sandbox.stub();
+
+        sandbox.stub(helpers, 'postLookup').get(function () {
+            return postLookUpStub;
+        });
+
+        sandbox.stub(helpers, 'secure').get(function () {
+            return secureStub;
+        });
+
+        sandbox.stub(helpers, 'renderEntry').get(function () {
+            return renderStub;
+        });
+
+        sandbox.stub(filters, 'doFilter');
+
+        sandbox.stub(urlService.utils, 'redirectToAdmin');
+        sandbox.stub(urlService.utils, 'redirect301');
+        sandbox.stub(urlService, 'getResource');
+
+        req = {
+            path: '/',
+            params: {},
+            route: {}
+        };
+
+        res = {
+            locals: {
+                routerOptions: {}
+            },
+            render: sinon.spy(),
+            redirect: sinon.spy()
+        };
+    });
+
+    afterEach(function () {
+        sandbox.restore();
+    });
+
+    it('resource not found', function (done) {
+        req.path = '/does-not-exist/';
+
+        postLookUpStub.withArgs(req.path, res.locals.routerOptions)
+            .resolves(null);
+
+        controllers.entry(req, res, function (err) {
+            should.not.exist(err);
+            done();
+        });
+    });
+
+    it('resource found', function (done) {
+        req.path = post.url;
+        req.originalUrl = req.path;
+
+        res.locals.routerOptions.type = 'posts';
+
+        filters.doFilter.withArgs('prePostsRender', post, res.locals).resolves();
+
+        urlService.getResource.withArgs(post.url).returns({
+            config: {
+                type: 'posts'
+            }
+        });
+
+        postLookUpStub.withArgs(req.path, res.locals.routerOptions)
+            .resolves({
+                post: post
+            });
+
+        renderStub.callsFake(function () {
+            secureStub.calledOnce.should.be.true();
+            done();
+        });
+
+        controllers.entry(req, res);
+    });
+
+    describe('[edge cases] resource found', function () {
+        it('isUnknownOption: true', function (done) {
+            req.path = post.url;
+
+            postLookUpStub.withArgs(req.path, res.locals.routerOptions)
+                .resolves({
+                    isUnknownOption: true,
+                    post: post
+                });
+
+            controllers.entry(req, res, function (err) {
+                should.not.exist(err);
+                done();
+            });
+        });
+
+        it('isEditURL: true', function (done) {
+            req.path = post.url;
+
+            postLookUpStub.withArgs(req.path, res.locals.routerOptions)
+                .resolves({
+                    isEditURL: true,
+                    post: post
+                });
+
+            urlService.utils.redirectToAdmin.callsFake(function (statusCode, res, editorUrl) {
+                statusCode.should.eql(302);
+                editorUrl.should.eql(EDITOR_URL + post.id);
+                done();
+            });
+
+            controllers.entry(req, res);
+        });
+
+        it('type of router !== type of resource', function (done) {
+            req.path = post.url;
+            res.locals.routerOptions.type = 'posts';
+
+            urlService.getResource.withArgs(post.url).returns({
+                config: {
+                    type: 'pages'
+                }
+            });
+
+            postLookUpStub.withArgs(req.path, res.locals.routerOptions)
+                .resolves({
+                    post: post
+                });
+
+            controllers.entry(req, res, function (err) {
+                should.not.exist(err);
+                done();
+            });
+        });
+
+        it('requested url !== resource url', function (done) {
+            post.url = '/2017/08/' + post.url;
+            req.path = '/2017/07/' + post.url;
+            req.originalUrl = req.path;
+
+            res.locals.routerOptions.type = 'posts';
+
+            urlService.getResource.withArgs(post.url).returns({
+                config: {
+                    type: 'posts'
+                }
+            });
+
+            postLookUpStub.withArgs(req.path, res.locals.routerOptions)
+                .resolves({
+                    post: post
+                });
+
+            urlService.utils.redirect301.callsFake(function (res, postUrl) {
+                postUrl.should.eql(post.url);
+                done();
+            });
+
+            controllers.entry(req, res);
+        });
+    });
+});
diff --git a/core/test/unit/services/routing/controllers/preview_spec.js b/core/test/unit/services/routing/controllers/preview_spec.js
new file mode 100644
index 0000000000..5992be3287
--- /dev/null
+++ b/core/test/unit/services/routing/controllers/preview_spec.js
@@ -0,0 +1,139 @@
+const should = require('should'),
+    sinon = require('sinon'),
+    Promise = require('bluebird'),
+    testUtils = require('../../../../utils'),
+    configUtils = require('../../../../utils/configUtils'),
+    api = require('../../../../../server/api'),
+    filters = require('../../../../../server/filters'),
+    controllers = require('../../../../../server/services/routing/controllers'),
+    helpers = require('../../../../../server/services/routing/helpers'),
+    urlService = require('../../../../../server/services/url'),
+    sandbox = sinon.sandbox.create(),
+    EDITOR_URL = '/editor/';
+
+describe('Unit - services/routing/controllers/preview', function () {
+    let secureStub, renderStub;
+    let req, res, post, apiResponse;
+
+    function failTest(done) {
+        return function (err) {
+            should.exist(err);
+            done(err);
+        };
+    }
+
+    afterEach(function () {
+        sandbox.restore();
+        configUtils.restore();
+    });
+
+    beforeEach(function () {
+        post = testUtils.DataGenerator.forKnex.createPost({status: 'draft'});
+
+        apiResponse = {
+            posts: [post]
+        };
+
+        req = {
+            path: '/',
+            params: {
+                uuid: 'something'
+            },
+            route: {}
+        };
+
+        res = {
+            locals: {},
+            render: sinon.spy(),
+            redirect: sinon.spy(),
+            set: sinon.spy()
+        };
+
+        secureStub = sandbox.stub();
+        renderStub = sandbox.stub();
+
+        sandbox.stub(urlService.utils, 'redirectToAdmin');
+        sandbox.stub(urlService.utils, 'redirect301');
+        sandbox.stub(urlService, 'getUrlByResourceId');
+
+        sandbox.stub(helpers, 'secure').get(function () {
+            return secureStub;
+        });
+
+        sandbox.stub(helpers, 'renderEntry').get(function () {
+            return renderStub;
+        });
+
+        sandbox.stub(filters, 'doFilter');
+
+        sandbox.stub(api.posts, 'read').withArgs({
+            uuid: req.params.uuid,
+            status: 'all',
+            include: 'author,authors,tags'
+        }).callsFake(function () {
+            return Promise.resolve(apiResponse);
+        });
+    });
+
+    it('should render post', function (done) {
+        filters.doFilter.withArgs('prePostsRender', post, res.locals).resolves();
+
+        helpers.renderEntry.callsFake(function () {
+            renderStub.called.should.be.true();
+            secureStub.called.should.be.true();
+            done();
+        });
+
+        controllers.preview(req, res, failTest(done));
+    });
+
+    it('should call next if post is not found', function (done) {
+        apiResponse = {posts: []};
+
+        controllers.preview(req, res, function (err) {
+            should.not.exist(err);
+            renderStub.called.should.be.false();
+            secureStub.called.should.be.false();
+            done();
+        });
+    });
+
+    it('should call redirect if post is published', function (done) {
+        post.status = 'published';
+        urlService.getUrlByResourceId.withArgs(post.id).returns('/something/');
+
+        urlService.utils.redirect301.callsFake(function (res, postUrl) {
+            postUrl.should.eql('/something/');
+            renderStub.called.should.be.false();
+            secureStub.called.should.be.false();
+            done();
+        });
+
+        controllers.preview(req, res, failTest(done));
+    });
+
+    it('should call redirect if /edit/ (options param) is detected', function (done) {
+        req.params.options = 'edit';
+
+        urlService.utils.redirectToAdmin.callsFake(function (statusCode, res, editorUrl) {
+            statusCode.should.eql(302);
+            editorUrl.should.eql(EDITOR_URL + post.id);
+            renderStub.called.should.be.false();
+            secureStub.called.should.be.false();
+            done();
+        });
+
+        controllers.preview(req, res, failTest(done));
+    });
+
+    it('should call next for unknown options param detected', function (done) {
+        req.params.options = 'abcde';
+
+        controllers.preview(req, res, function (err) {
+            should.not.exist(err);
+            renderStub.called.should.be.false();
+            secureStub.called.should.be.false();
+            done();
+        });
+    });
+});
diff --git a/core/test/unit/services/routing/controllers/rss_spec.js b/core/test/unit/services/routing/controllers/rss_spec.js
new file mode 100644
index 0000000000..2c8218bd47
--- /dev/null
+++ b/core/test/unit/services/routing/controllers/rss_spec.js
@@ -0,0 +1,181 @@
+const should = require('should'),
+    sinon = require('sinon'),
+    _ = require('lodash'),
+    testUtils = require('../../../../utils'),
+    common = require('../../../../../server/lib/common'),
+    security = require('../../../../../server/lib/security'),
+    settingsCache = require('../../../../../server/services/settings/cache'),
+    controllers = require('../../../../../server/services/routing/controllers'),
+    helpers = require('../../../../../server/services/routing/helpers'),
+    rssService = require('../../../../../server/services/rss'),
+    sandbox = sinon.sandbox.create();
+
+// Helper function to prevent unit tests
+// from failing via timeout when they
+// should just immediately fail
+function failTest(done) {
+    return function (err) {
+        done(err);
+    };
+}
+
+describe('Unit - services/routing/controllers/rss', function () {
+    let req, res, next, fetchDataStub, posts;
+
+    beforeEach(function () {
+        posts = [
+            testUtils.DataGenerator.forKnex.createPost(),
+            testUtils.DataGenerator.forKnex.createPost()
+        ];
+
+        req = {
+            params: {},
+            originalUrl: '/rss/'
+        };
+
+        res = {
+            locals: {
+                safeVersion: '0.6',
+                routerOptions: {}
+            }
+        };
+
+        next = sandbox.stub();
+        fetchDataStub = sandbox.stub();
+
+        sandbox.stub(helpers, 'fetchData').get(function () {
+            return fetchDataStub;
+        });
+
+        sandbox.stub(security.string, 'safe').returns('safe');
+
+        sandbox.stub(rssService, 'render');
+
+        sandbox.stub(settingsCache, 'get');
+        settingsCache.get.withArgs('title').returns('Ghost');
+        settingsCache.get.withArgs('description').returns('Ghost is cool!');
+    });
+
+    afterEach(function () {
+        sandbox.restore();
+    });
+
+    it('should fetch data and attempt to send XML', function (done) {
+        fetchDataStub.withArgs({page: 1, slug: undefined}).resolves({
+            posts: posts,
+            meta: {
+                pagination: {
+                    pages: 2
+                }
+            }
+        });
+
+        rssService.render.callsFake(function (res, baseUrl, data) {
+            baseUrl.should.eql('/rss/');
+            data.posts.should.eql(posts);
+            data.meta.pagination.pages.should.eql(2);
+            data.title.should.eql('Ghost');
+            data.description.should.eql('Ghost is cool!');
+            done();
+        });
+
+        controllers.rss(req, res, failTest(done));
+    });
+
+    it('can handle paginated urls', function (done) {
+        req.originalUrl = '/rss/2/';
+        req.params.page = 2;
+
+        fetchDataStub.withArgs({page: 2, slug: undefined}).resolves({
+            posts: posts,
+            meta: {
+                pagination: {
+                    pages: 2
+                }
+            }
+        });
+
+        rssService.render.callsFake(function (res, baseUrl, data) {
+            baseUrl.should.eql('/rss/');
+            data.posts.should.eql(posts);
+            data.meta.pagination.pages.should.eql(2);
+            data.title.should.eql('Ghost');
+            data.description.should.eql('Ghost is cool!');
+            done();
+        });
+
+        controllers.rss(req, res, failTest(done));
+    });
+
+    it('can handle paginated urls with subdirectories', function (done) {
+        req.originalUrl = '/blog/rss/2/';
+        req.params.page = 2;
+
+        fetchDataStub.withArgs({page: 2, slug: undefined}).resolves({
+            posts: posts,
+            meta: {
+                pagination: {
+                    pages: 2
+                }
+            }
+        });
+
+        rssService.render.callsFake(function (res, baseUrl, data) {
+            baseUrl.should.eql('/blog/rss/');
+            data.posts.should.eql(posts);
+            data.meta.pagination.pages.should.eql(2);
+            data.title.should.eql('Ghost');
+            data.description.should.eql('Ghost is cool!');
+            done();
+        });
+
+        controllers.rss(req, res, failTest(done));
+    });
+
+    it('can handle paginated urls for taxonomies', function (done) {
+        req.originalUrl = '/tags/test/rss/2/';
+        req.params.page = 2;
+        req.params.slug = 'unsafe';
+
+        fetchDataStub.withArgs({page: 2, slug: 'safe'}).resolves({
+            posts: posts,
+            meta: {
+                pagination: {
+                    pages: 3
+                }
+            }
+        });
+
+        rssService.render.callsFake(function (res, baseUrl, data) {
+            baseUrl.should.eql('/tags/test/rss/');
+            data.posts.should.eql(posts);
+            data.meta.pagination.pages.should.eql(3);
+            data.title.should.eql('Ghost');
+            data.description.should.eql('Ghost is cool!');
+            done();
+        });
+
+        controllers.rss(req, res, failTest(done));
+    });
+
+    it('should call next with 404 if page number too big', function (done) {
+        req.originalUrl = '/rss/4/';
+        req.params.page = 4;
+
+        fetchDataStub.withArgs({page: 4, slug: undefined}).resolves({
+            posts: posts,
+            meta: {
+                pagination: {
+                    pages: 3
+                }
+            }
+        });
+
+        controllers.rss(req, res, function (err) {
+            should.exist(err);
+            (err instanceof common.errors.NotFoundError).should.be.true();
+            rssService.render.called.should.be.false();
+            done();
+        });
+    });
+});
diff --git a/core/test/unit/services/routing/helpers/context_spec.js b/core/test/unit/services/routing/helpers/context_spec.js
new file mode 100644
index 0000000000..ef085b6012
--- /dev/null
+++ b/core/test/unit/services/routing/helpers/context_spec.js
@@ -0,0 +1,302 @@
+const should = require('should'),
+    sinon = require('sinon'),
+    _ = require('lodash'),
+    testUtils = require('../../../../utils'),
+    helpers = require('../../../../../server/services/routing/helpers'),
+    labs = require('../../../../../server/services/labs'),
+    sandbox = sinon.sandbox.create();
+
+describe('Contexts', function () {
+    let req, res, data, setupContext;
+
+    beforeEach(function () {
+        req = {
+            params: {},
+            body: {}
+        };
+        res = {
+            locals: {
+                routerOptions: {}
+            }
+        };
+        data = {};
+    });
+
+    afterEach(function () {
+        sandbox.restore();
+    });
+
+    describe('Unknown', function () {
+        it('should return empty array with no error if all parameters are empty', function () {
+            // Reset all parameters to empty
+            req = {};
+            res = {};
+            data = {};
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(0);
+        });
+
+        it('should return empty array with no error with basic parameters', function () {
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(0);
+        });
+    });
+
+    describe('index context', function () {
+        it('should correctly identify index channel', function () {
+            res.locals.relativeUrl = '/does/not/matter/';
+            res.locals.routerOptions.context = ['index'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('index');
+        });
+
+        it('should correctly identify / as home', function () {
+            res.locals.relativeUrl = '/';
+            res.locals.routerOptions.context = ['index'];
+
+            // Execute test
+            helpers.context(req, res, data);
+
+            // Check context
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(2);
+            res.locals.context[0].should.eql('home');
+            res.locals.context[1].should.eql('index');
+        });
+
+        it('will not identify / as index without config', function () {
+            res.locals.relativeUrl = '/';
+            res.locals.routerOptions.context = [];
+
+            // Execute test
+            helpers.context(req, res, data);
+
+            // Check context
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('home');
+        });
+
+        it('will not identify /page/2/ as index & paged without page param', function () {
+            res.locals.relativeUrl = '/page/2/';
+            res.locals.routerOptions.context = ['index'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('index');
+        });
+
+        it('should identify /page/2/ as index & paged with page param', function () {
+            res.locals.relativeUrl = '/page/2/';
+            req.params.page = 2;
+            res.locals.routerOptions.context = ['index'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(2);
+            res.locals.context[0].should.eql('paged');
+            res.locals.context[1].should.eql('index');
+        });
+    });
+
+    describe('Tag', function () {
+        it('should correctly identify tag channel', function () {
+            res.locals.relativeUrl = '/tag/getting-started/';
+            res.locals.routerOptions.context = ['tag'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('tag');
+        });
+
+        it('will not identify tag channel url without config', function () {
+            res.locals.relativeUrl = '/tag/getting-started/';
+            res.locals.routerOptions.context = [];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(0);
+        });
+
+        it('will not identify /page/2/ as paged without page param', function () {
+            res.locals.relativeUrl = '/tag/getting-started/page/2/';
+            res.locals.routerOptions.context = ['tag'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('tag');
+        });
+
+        it('should correctly identify /page/2/ as paged with page param', function () {
+            res.locals.relativeUrl = '/tag/getting-started/page/2/';
+            req.params.page = 2;
+            res.locals.routerOptions.context = ['tag'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(2);
+            res.locals.context[0].should.eql('paged');
+            res.locals.context[1].should.eql('tag');
+        });
+    });
+
+    describe('Author', function () {
+        it('should correctly identify author channel', function () {
+            res.locals.relativeUrl = '/author/pat/';
+            res.locals.routerOptions.context = ['author'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('author');
+        });
+
+        it('will not identify author channel url without config', function () {
+            res.locals.relativeUrl = '/author/pat/';
+            res.locals.routerOptions.context = [];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(0);
+        });
+
+        it('will not identify /page/2/ as paged without page param', function () {
+            res.locals.relativeUrl = '/author/pat/page/2/';
+            res.locals.routerOptions.context = ['author'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('author');
+        });
+
+        it('should correctly identify /page/2/ as paged with page param', function () {
+            res.locals.relativeUrl = '/author/pat/page/2/';
+            req.params.page = 2;
+            res.locals.routerOptions.context = ['author'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(2);
+            res.locals.context[0].should.eql('paged');
+            res.locals.context[1].should.eql('author');
+        });
+    });
+
+    describe('Custom', function () {
+        it('will use a custom context', function () {
+            res.locals.relativeUrl = 'anything';
+            res.locals.routerOptions.context = ['custom-context', 'test'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(2);
+            res.locals.context[0].should.eql('custom-context');
+            res.locals.context[1].should.eql('test');
+        });
+    });
+
+    describe('Posts & Pages', function () {
+        it('ensure correct context', function () {
+            res.locals.relativeUrl = '/welcome-to-ghost/';
+            res.locals.routerOptions.context = ['post'];
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('post');
+        });
+    });
+
+    describe('Private', function () {
+        it('should correctly identify /private/ as the private route', function () {
+            res.locals.relativeUrl = '/private/?r=';
+            delete res.locals.routerOptions;
+
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('private');
+        });
+    });
+
+    describe('Subscribe', function () {
+        it('should identify /subscribe/ as the subscribe route if labs flag set', function () {
+            res.locals.relativeUrl = '/subscribe/';
+            sandbox.stub(labs, 'isSet').withArgs('subscribers').returns(true);
+
+            delete res.locals.routerOptions;
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('subscribe');
+        });
+
+        it('should not identify /subscribe/ as subscribe route if labs flag NOT set', function () {
+            res.locals.relativeUrl = '/subscribe/';
+            sandbox.stub(labs, 'isSet').withArgs('subscribers').returns(false);
+            data.post = testUtils.DataGenerator.forKnex.createPost();
+
+            delete res.locals.routerOptions;
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(1);
+            res.locals.context[0].should.eql('post');
+        });
+    });
+
+    describe('AMP', function () {
+        it('should correctly identify AMP post', function () {
+            res.locals.relativeUrl = '/welcome-to-ghost/amp/';
+            data.post = testUtils.DataGenerator.forKnex.createPost();
+
+            delete res.locals.routerOptions;
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(2);
+            res.locals.context[0].should.eql('amp');
+            res.locals.context[1].should.eql('post');
+        });
+
+        it('should correctly identify AMP page', function () {
+            res.locals.relativeUrl = '/welcome-to-ghost/amp/';
+            data.post = testUtils.DataGenerator.forKnex.createPost({page: true});
+
+            delete res.locals.routerOptions;
+            helpers.context(req, res, data);
+
+            should.exist(res.locals.context);
+            res.locals.context.should.be.an.Array().with.lengthOf(2);
+            res.locals.context[0].should.eql('amp');
+            res.locals.context[1].should.eql('page');
+        });
+    });
+});
diff --git a/core/test/unit/controllers/frontend/error_spec.js b/core/test/unit/services/routing/helpers/error_spec.js
similarity index 64%
rename from core/test/unit/controllers/frontend/error_spec.js
rename to core/test/unit/services/routing/helpers/error_spec.js
index 3bfcda85c5..d83134b4cc 100644
--- a/core/test/unit/controllers/frontend/error_spec.js
+++ b/core/test/unit/services/routing/helpers/error_spec.js
@@ -1,14 +1,12 @@
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
-    common = require('../../../../server/lib/common'),
-
-    // Stuff we are testing
-    handleError = require('../../../../server/controllers/frontend/error'),
-
+    common = require('../../../../../server/lib/common'),
+    helpers = require('../../../../../server/services/routing/helpers'),
     sandbox = sinon.sandbox.create();
 
 describe('handleError', function () {
-    var next;
+    let next;
+
     beforeEach(function () {
         next = sandbox.spy();
     });
@@ -18,17 +16,18 @@ describe('handleError', function () {
     });
 
     it('should call next with no args for 404 errors', function () {
-        var notFoundError = new common.errors.NotFoundError({message: 'Something wasn\'t found'});
-        handleError(next)(notFoundError);
+        const notFoundError = new common.errors.NotFoundError({message: 'Something wasn\'t found'});
+        helpers.handleError(next)(notFoundError);
 
         next.calledOnce.should.be.true();
         next.firstCall.args.should.be.empty();
     });
+
     it('should call next with error for other errors', function () {
-        var otherError = new Error();
+        const otherError = new Error();
         otherError.message = 'Something wasn\'t allowed';
 
-        handleError(next)(otherError);
+        helpers.handleError(next)(otherError);
 
         next.calledOnce.should.be.true();
         next.firstCall.args.should.have.lengthOf(1);
diff --git a/core/test/unit/services/routing/helpers/fetch-data_spec.js b/core/test/unit/services/routing/helpers/fetch-data_spec.js
new file mode 100644
index 0000000000..39ffc71efb
--- /dev/null
+++ b/core/test/unit/services/routing/helpers/fetch-data_spec.js
@@ -0,0 +1,212 @@
+const should = require('should'),
+    sinon = require('sinon'),
+    api = require('../../../../../server/api'),
+    urlService = require('../../../../../server/services/url'),
+    helpers = require('../../../../../server/services/routing/helpers'),
+    testUtils = require('../../../../utils'),
+    sandbox = sinon.sandbox.create();
+
+describe('Unit - services/routing/helpers/fetch-data', function () {
+    let posts, tags, users;
+
+    beforeEach(function () {
+        posts = [
+            testUtils.DataGenerator.forKnex.createPost({url: '/a/'}),
+            testUtils.DataGenerator.forKnex.createPost({url: '/b/'}),
+            testUtils.DataGenerator.forKnex.createPost({url: '/c/'}),
+            testUtils.DataGenerator.forKnex.createPost({url: '/d/'})
+        ];
+
+        tags = [
+            testUtils.DataGenerator.forKnex.createTag(),
+            testUtils.DataGenerator.forKnex.createTag(),
+            testUtils.DataGenerator.forKnex.createTag(),
+            testUtils.DataGenerator.forKnex.createTag()
+        ];
+
+        sandbox.stub(api.posts, 'browse')
+            .resolves({
+                posts: posts,
+                meta: {
+                    pagination: {
+                        pages: 2
+                    }
+                }
+            });
+
+        sandbox.stub(api.tags, 'read').resolves({tags: tags});
+
+        sandbox.stub(urlService, 'owns');
+    });
+
+    afterEach(function () {
+        sandbox.restore();
+    });
+
+    it('should handle no options', function (done) {
+        helpers.fetchData().then(function (result) {
+            should.exist(result);
+            result.should.be.an.Object().with.properties('posts', 'meta');
+            result.should.not.have.property('data');
+
+            api.posts.browse.calledOnce.should.be.true();
+            api.posts.browse.firstCall.args[0].should.be.an.Object();
+            api.posts.browse.firstCall.args[0].should.have.property('include');
+            api.posts.browse.firstCall.args[0].should.not.have.property('filter');
+
+            done();
+        }).catch(done);
+    });
+
+    it('should handle path options with page/limit', function (done) {
+        helpers.fetchData({page: 2, limit: 10}).then(function (result) {
+            should.exist(result);
+            result.should.be.an.Object().with.properties('posts', 'meta');
+            result.should.not.have.property('data');
+
+            result.posts.length.should.eql(posts.length);
+            urlService.owns.called.should.be.false();
+
+            api.posts.browse.calledOnce.should.be.true();
+            api.posts.browse.firstCall.args[0].should.be.an.Object();
+            api.posts.browse.firstCall.args[0].should.have.property('include');
+            api.posts.browse.firstCall.args[0].should.have.property('limit', 10);
+            api.posts.browse.firstCall.args[0].should.have.property('page', 2);
+
+            done();
+        }).catch(done);
+    });
+
+    it('should handle multiple queries', function (done) {
+        const pathOptions = {};
+
+        const routerOptions = {
+            data: {
+                featured: {
+                    type: 'browse',
+                    resource: 'posts',
+                    options: {
+                        filter: 'featured:true',
+                        limit: 3
+                    }
+                }
+            }
+        };
+
+        helpers.fetchData(pathOptions, routerOptions).then(function (result) {
+            should.exist(result);
+            result.should.be.an.Object().with.properties('posts', 'meta', 'data');
+            result.data.should.be.an.Object().with.properties('featured');
+            result.data.featured.should.be.an.Object().with.properties('posts', 'meta');
+            result.data.featured.should.not.have.properties('data');
+
+            result.posts.length.should.eql(posts.length);
+            result.data.featured.posts.length.should.eql(posts.length);
+            urlService.owns.called.should.be.false();
+
+            api.posts.browse.calledTwice.should.be.true();
+            api.posts.browse.firstCall.args[0].should.have.property('include', 'author,authors,tags');
+
+            api.posts.browse.secondCall.args[0].should.have.property('filter', 'featured:true');
+            api.posts.browse.secondCall.args[0].should.have.property('limit', 3);
+            done();
+        }).catch(done);
+    });
+
+    it('should handle multiple queries with page param', function (done) {
+        const pathOptions = {
+            page: 2
+        };
+
+        const routerOptions = {
+            data: {
+                featured: {
+                    type: 'browse',
+                    resource: 'posts',
+                    options: {filter: 'featured:true', limit: 3}
+                }
+            }
+        };
+
+        helpers.fetchData(pathOptions, routerOptions).then(function (result) {
+            should.exist(result);
+
+            result.should.be.an.Object().with.properties('posts', 'meta', 'data');
+            result.data.should.be.an.Object().with.properties('featured');
+            result.data.featured.should.be.an.Object().with.properties('posts', 'meta');
+            result.data.featured.should.not.have.properties('data');
+
+            result.posts.length.should.eql(posts.length);
+            result.data.featured.posts.length.should.eql(posts.length);
+            urlService.owns.called.should.be.false();
+
+            api.posts.browse.calledTwice.should.be.true();
+            api.posts.browse.firstCall.args[0].should.have.property('include', 'author,authors,tags');
+            api.posts.browse.firstCall.args[0].should.have.property('page', 2);
+            api.posts.browse.secondCall.args[0].should.have.property('filter', 'featured:true');
+            api.posts.browse.secondCall.args[0].should.have.property('limit', 3);
+            done();
+        }).catch(done);
+    });
+
+    it('should handle queries with slug replacements', function (done) {
+        const pathOptions = {
+            slug: 'testing'
+        };
+
+        const routerOptions = {
+            filter: 'tags:%s',
+            data: {
+                tag: {
+                    type: 'read',
+                    resource: 'tags',
+                    options: {slug: '%s'}
+                }
+            }
+        };
+
+        helpers.fetchData(pathOptions, routerOptions).then(function (result) {
+            should.exist(result);
+            result.should.be.an.Object().with.properties('posts', 'meta', 'data');
+            result.data.should.be.an.Object().with.properties('tag');
+
+            result.posts.length.should.eql(posts.length);
+            result.data.tag.length.should.eql(tags.length);
+            urlService.owns.called.should.be.false();
+
+            api.posts.browse.calledOnce.should.be.true();
+            api.posts.browse.firstCall.args[0].should.have.property('include');
+            api.posts.browse.firstCall.args[0].should.have.property('filter', 'tags:testing');
+            api.posts.browse.firstCall.args[0].should.not.have.property('slug');
+            api.tags.read.firstCall.args[0].should.have.property('slug', 'testing');
+            done();
+        }).catch(done);
+    });
+
+    it('should verify if post belongs to collection', function (done) {
+        const pathOptions = {};
+
+        const routerOptions = {
+            identifier: 'identifier',
+            filter: 'featured:true'
+        };
+
+        urlService.owns.withArgs('identifier', posts[0].url).returns(false);
+        urlService.owns.withArgs('identifier', posts[1].url).returns(true);
+        urlService.owns.withArgs('identifier', posts[2].url).returns(false);
+        urlService.owns.withArgs('identifier', posts[3].url).returns(false);
+
+        helpers.fetchData(pathOptions, routerOptions).then(function (result) {
+            should.exist(result);
+            result.should.be.an.Object().with.properties('posts', 'meta');
+
+            result.posts.length.should.eql(1);
+            urlService.owns.callCount.should.eql(4);
+
+            api.posts.browse.calledOnce.should.be.true();
+            api.posts.browse.firstCall.args[0].should.have.property('include');
+            api.posts.browse.firstCall.args[0].should.have.property('filter', 'featured:true');
+            done();
+        }).catch(done);
+    });
+});
diff --git a/core/test/unit/controllers/frontend/format-response_spec.js b/core/test/unit/services/routing/helpers/format-response_spec.js
similarity index 57%
rename from core/test/unit/controllers/frontend/format-response_spec.js
rename to core/test/unit/services/routing/helpers/format-response_spec.js
index 710609a42e..7589cb1149 100644
--- a/core/test/unit/controllers/frontend/format-response_spec.js
+++ b/core/test/unit/services/routing/helpers/format-response_spec.js
@@ -1,30 +1,41 @@
-var should = require('should'),
+const should = require('should'),
+    testUtils = require('../../../../utils'),
+    helpers = require('../../../../../server/services/routing/helpers');
 
-    // Stuff we are testing
-    formatResponse = require('../../../../server/controllers/frontend/format-response');
+describe('Unit - services/routing/helpers/format-response', function () {
+    let posts, tags;
+
+    beforeEach(function () {
+        posts = [
+            testUtils.DataGenerator.forKnex.createPost({slug: 'sluggy-thing'})
+        ];
+
+        tags = [
+            testUtils.DataGenerator.forKnex.createTag({name: 'video', slug: 'video'})
+        ];
+    });
 
-describe('formatResponse', function () {
     describe('entry', function () {
         it('should return the post object wrapped in a post key', function () {
-            var formatted,
-                postObject = {slug: 'sluggy-thing'};
+            let formatted,
+                postObject = posts[0];
 
-            formatted = formatResponse.entry(postObject);
+            formatted = helpers.formatResponse.entry(postObject);
 
             formatted.should.be.an.Object().with.property('post');
             formatted.post.should.eql(postObject);
         });
     });
 
-    describe('channel', function () {
+    describe('collection', function () {
         it('should return posts and posts pagination as top level keys', function () {
-            var formatted,
+            let formatted,
                 data = {
-                    posts: [{slug: 'a-post'}],
+                    posts: posts,
                     meta: {pagination: {}}
                 };
 
-            formatted = formatResponse.channel(data);
+            formatted = helpers.formatResponse.collection(data);
 
             formatted.should.be.an.Object().with.properties('posts', 'pagination');
             formatted.posts.should.eql(data.posts);
@@ -32,33 +43,33 @@ describe('formatResponse', function () {
         });
 
         it('should flatten api read responses which have no pagination data', function () {
-            var formatted,
+            let formatted,
                 data = {
-                    posts: [{slug: 'a-post'}],
+                    posts: posts,
                     meta: {pagination: {}},
-                    data: {tag: [{name: 'video', slug: 'video', id: 1}]}
+                    data: {tag: tags}
                 };
 
-            formatted = formatResponse.channel(data);
+            formatted = helpers.formatResponse.collection(data);
 
             formatted.should.be.an.Object().with.properties('posts', 'pagination', 'tag');
             formatted.tag.should.eql(data.data.tag[0]);
         });
 
         it('should remove the meta key from api browse responses', function () {
-            var formatted,
+            let formatted,
                 data = {
-                    posts: [{slug: 'a-post'}],
+                    posts: posts,
                     meta: {pagination: {}},
                     data: {
                         featured: {
-                            posts: [{id: 1, title: 'featured post 1', slug: 'featured-1'}],
+                            posts: posts,
                             meta: {pagination: {}}
                         }
                     }
                 };
 
-            formatted = formatResponse.channel(data);
+            formatted = helpers.formatResponse.collection(data);
 
             formatted.should.be.an.Object().with.properties('posts', 'pagination', 'featured');
             formatted.featured.should.be.an.Object().with.properties('posts', 'pagination');
diff --git a/core/test/unit/services/routing/helpers/post-lookup_spec.js b/core/test/unit/services/routing/helpers/post-lookup_spec.js
new file mode 100644
index 0000000000..cd7e0cbe3d
--- /dev/null
+++ b/core/test/unit/services/routing/helpers/post-lookup_spec.js
@@ -0,0 +1,234 @@
+const should = require('should'),
+    sinon = require('sinon'),
+    Promise = require('bluebird'),
+    testUtils = require('../../../../utils'),
+    api = require('../../../../../server/api'),
+    helpers = require('../../../../../server/services/routing/helpers'),
+    sandbox = sinon.sandbox.create();
+
+describe('Unit - services/routing/helpers/post-lookup', function () {
+    let posts;
+
+    afterEach(function () {
+        sandbox.restore();
+    });
+
+    beforeEach(function () {
+        sandbox.stub(api.posts, 'read');
+    });
+
+    describe('Permalinks: /:slug/', function () {
+        const routerOptions = {
+            permalinks: '/:slug/'
+        };
+
+        beforeEach(function () {
+            posts = [
+                testUtils.DataGenerator.forKnex.createPost({url: '/test/', slug: 'test'})
+            ];
+
+            api.posts.read.withArgs({slug: posts[0].slug, include: 'author,authors,tags'})
+                .resolves({
+                    posts: posts
+                });
+        });
+
+        it('can lookup absolute url: /:slug/', function (done) {
+            const testUrl = 'http://127.0.0.1:2369' + posts[0].url;
+
+            helpers.postLookup(testUrl, routerOptions).then(function (lookup) {
+                api.posts.read.calledOnce.should.be.true();
+                should.exist(lookup.post);
+                lookup.post.should.have.property('url', posts[0].url);
+                lookup.isEditURL.should.be.false();
+
+                done();
+            }).catch(done);
+        });
+
+        it('can lookup relative url: /:slug/', function (done) {
+            const testUrl = posts[0].url;
+
+            helpers.postLookup(testUrl, routerOptions).then(function (lookup) {
+                api.posts.read.calledOnce.should.be.true();
+                should.exist(lookup.post);
+                lookup.post.should.have.property('url', posts[0].url);
+                lookup.isEditURL.should.be.false();
+
+                done();
+            }).catch(done);
+        });
+
+        it('cannot lookup absolute url: /:year/:month/:day/:slug/', function (done) {
+            const testUrl = 'http://127.0.0.1:2369/2016/01/01' + posts[0].url;
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.false();
+                    should.not.exist(lookup);
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('cannot lookup relative url: /:year/:month/:day/:slug/', function (done) {
+            const testUrl = '/2016/01/01' + posts[0].url;
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.false();
+                    should.not.exist(lookup);
+                    done();
+                })
+                .catch(done);
+        });
+    });
+
+    describe('Permalinks: /:year/:month/:day/:slug/', function () {
+        const routerOptions = {
+            permalinks: '/:year/:month/:day/:slug/'
+        };
+
+        beforeEach(function () {
+            posts = [
+                testUtils.DataGenerator.forKnex.createPost({url: '/2016/01/01/example/', slug: 'example'})
+            ];
+
+            api.posts.read.withArgs({slug: posts[0].slug, include: 'author,authors,tags'})
+                .resolves({
+                    posts: posts
+                });
+        });
+
+        it('cannot lookup absolute url: /:slug/', function (done) {
+            const testUrl = 'http://127.0.0.1:2369/' + posts[0].slug;
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.false();
+                    should.not.exist(lookup);
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('cannot lookup relative url using :slug', function (done) {
+            const testUrl = posts[0].slug;
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.false();
+                    should.not.exist(lookup);
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('can lookup absolute url: /:year/:month/:day/:slug/', function (done) {
+            const testUrl = 'http://127.0.0.1:2369' + posts[0].url;
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.true();
+                    should.exist(lookup.post);
+                    lookup.post.should.have.property('url', posts[0].url);
+                    lookup.isEditURL.should.be.false();
+
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('can lookup relative url: /:year/:month/:day/:slug/', function (done) {
+            const testUrl = posts[0].url;
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.true();
+                    should.exist(lookup.post);
+                    lookup.post.should.have.property('url', posts[0].url);
+                    lookup.isEditURL.should.be.false();
+
+                    done();
+                })
+                .catch(done);
+        });
+    });
+
+    describe('with url options', function () {
+        const routerOptions = {
+            permalinks: '/:slug/:options(edit)?'
+        };
+
+        beforeEach(function () {
+            posts = [
+                testUtils.DataGenerator.forKnex.createPost({url: '/test/', slug: 'test'})
+            ];
+
+            api.posts.read.withArgs({slug: posts[0].slug, include: 'author,authors,tags'})
+                .resolves({posts: posts});
+        });
+
+        it('can lookup absolute url: /:slug/edit/', function (done) {
+            const testUrl = 'http://127.0.0.1:2369' + posts[0].url + 'edit/';
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.true();
+                    lookup.post.should.have.property('url', posts[0].url);
+                    lookup.isEditURL.should.be.true();
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('can lookup relative url: /:slug/edit/', function (done) {
+            const testUrl = posts[0].url + 'edit/';
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.true();
+                    lookup.post.should.have.property('url', posts[0].url);
+                    lookup.isEditURL.should.be.true();
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('cannot lookup absolute url: /:year/:month/:day/:slug/edit/', function (done) {
+            const testUrl = 'http://127.0.0.1:2369/2016/01/01' + posts[0].url + 'edit/';
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.false();
+                    should.not.exist(lookup);
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('cannot lookup relative url: /:year/:month/:day/:slug/edit/', function (done) {
+            const testUrl = '/2016/01/01' + posts[0].url + 'edit/';
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.false();
+                    should.not.exist(lookup);
+                    done();
+                })
+                .catch(done);
+        });
+
+        it('unknown url option', function (done) {
+            const testUrl = posts[0].url + 'not-edit/';
+
+            helpers.postLookup(testUrl, routerOptions)
+                .then(function (lookup) {
+                    api.posts.read.calledOnce.should.be.false();
+                    should.not.exist(lookup);
+                    done();
+                })
+                .catch(done);
+        });
+    });
+});
diff --git a/core/test/unit/controllers/frontend/templates_spec.js b/core/test/unit/services/routing/helpers/templates_spec.js
similarity index 82%
rename from core/test/unit/controllers/frontend/templates_spec.js
rename to core/test/unit/services/routing/helpers/templates_spec.js
index 800e5493fe..4bfeb9cb7a 100644
--- a/core/test/unit/controllers/frontend/templates_spec.js
+++ b/core/test/unit/services/routing/helpers/templates_spec.js
@@ -1,68 +1,68 @@
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
     rewire = require('rewire'),
-
-// Stuff we are testing
-    templates = rewire('../../../../server/controllers/frontend/templates'),
-    themes = require('../../../../server/services/themes'),
-
+    templates = rewire('../../../../../server/services/routing/helpers/templates'),
+    themes = require('../../../../../server/services/themes'),
     sandbox = sinon.sandbox.create();
 
 describe('templates', function () {
-    var getActiveThemeStub, hasTemplateStub,
+    let getActiveThemeStub, hasTemplateStub,
         _private = templates.__get__('_private');
 
     afterEach(function () {
         sandbox.restore();
     });
 
-    describe('[private] getChannelTemplateHierarchy', function () {
-        var channelTemplateList = _private.getChannelTemplateHierarchy;
-
-        it('should return just index for empty channelOpts', function () {
-            channelTemplateList({}).should.eql(['index']);
+    describe('[private fn] getCollectionTemplateHierarchy', function () {
+        it('should return just index for empty options', function () {
+            _private.getCollectionTemplateHierarchy({}).should.eql(['index']);
         });
 
-        it('should return just index if channel name is index', function () {
-            channelTemplateList({name: 'index'}).should.eql(['index']);
+        it('should return just index if collection name is index', function () {
+            _private.getCollectionTemplateHierarchy({name: 'index'}).should.eql(['index']);
         });
 
-        it('should return just index if channel name is index even if slug is set', function () {
-            channelTemplateList({name: 'index', slugTemplate: true, slugParam: 'test'}).should.eql(['index']);
+        it('should return just index if collection name is index even if slug is set', function () {
+            _private.getCollectionTemplateHierarchy({name: 'index', slugTemplate: true, slugParam: 'test'}).should.eql(['index']);
         });
 
-        it('should return channel, index if channel has name', function () {
-            channelTemplateList({name: 'tag'}).should.eql(['tag', 'index']);
+        it('should return collection, index if collection has name', function () {
+            _private.getCollectionTemplateHierarchy({name: 'tag'}).should.eql(['tag', 'index']);
         });
 
-        it('should return channel-slug, channel, index if channel has name & slug + slugTemplate set', function () {
-            channelTemplateList({
+        it('should return collection-slug, collection, index if collection has name & slug + slugTemplate set', function () {
+            _private.getCollectionTemplateHierarchy({
                 name: 'tag',
                 slugTemplate: true,
                 slugParam: 'test'
             }).should.eql(['tag-test', 'tag', 'index']);
         });
 
-        it('should return front, channel-slug, channel, index if name, slugParam+slugTemplate & frontPageTemplate+pageParam=1 is set', function () {
-            channelTemplateList({
+        it('should return front, collection-slug, collection, index if name, slugParam+slugTemplate & frontPageTemplate+pageParam=1 is set', function () {
+            _private.getCollectionTemplateHierarchy({
                 name: 'tag',
                 slugTemplate: true,
                 slugParam: 'test',
-                frontPageTemplate: 'front-tag',
-                postOptions: {page: 1}
-            }).should.eql(['front-tag', 'tag-test', 'tag', 'index']);
+                frontPageTemplate: 'front-tag'
+            }, {page: 1, path: '/'}).should.eql(['front-tag', 'tag-test', 'tag', 'index']);
         });
 
-        it('should return home, index for index channel if front is set and pageParam = 1', function () {
-            channelTemplateList({
+        it('should return home, index for index collection if front is set and pageParam = 1', function () {
+            _private.getCollectionTemplateHierarchy({
                 name: 'index',
-                frontPageTemplate: 'home',
-                postOptions: {page: 1}
-            }).should.eql(['home', 'index']);
+                frontPageTemplate: 'home'
+            }, {path: '/'}).should.eql(['home', 'index']);
+        });
+
+        it('should not use frontPageTemplate if not / collection', function () {
+            _private.getCollectionTemplateHierarchy({
+                name: 'index',
+                frontPageTemplate: 'home'
+            }, {path: '/magic/'}).should.eql(['index']);
         });
     });
 
-    describe('[private] pickTemplate', function () {
+    describe('[private fn] pickTemplate', function () {
         beforeEach(function () {
             hasTemplateStub = sandbox.stub().returns(false);
 
@@ -108,7 +108,7 @@ describe('templates', function () {
         });
     });
 
-    describe('[private] getTemplateForEntry', function () {
+    describe('[private fn] getTemplateForEntry', function () {
         beforeEach(function () {
             hasTemplateStub = sandbox.stub().returns(false);
 
@@ -117,6 +117,14 @@ describe('templates', function () {
             });
         });
 
+        it('will fall back to post even if no index.hbs', function () {
+            hasTemplateStub.returns(false);
+
+            var view = _private.getTemplateForEntry({page: 1});
+            should.exist(view);
+            view.should.eql('post');
+        });
+
         describe('with many templates', function () {
             beforeEach(function () {
                 // Set available Templates
@@ -234,17 +242,9 @@ describe('templates', function () {
                 view.should.eql('post');
             });
         });
-
-        it('will fall back to post even if no index.hbs', function () {
-            hasTemplateStub.returns(false);
-
-            var view = _private.getTemplateForEntry({page: 1});
-            should.exist(view);
-            view.should.eql('post');
-        });
     });
 
-    describe('[private] getTemplateForChannel', function () {
+    describe('[private fn] getTemplateForCollection', function () {
         beforeEach(function () {
             hasTemplateStub = sandbox.stub().returns(false);
 
@@ -260,7 +260,7 @@ describe('templates', function () {
             });
 
             it('will return correct view for a tag', function () {
-                var view = _private.getTemplateForChannel({name: 'tag', slugParam: 'development', slugTemplate: true});
+                var view = _private.getTemplateForCollection({name: 'tag', slugParam: 'development', slugTemplate: true});
                 should.exist(view);
                 view.should.eql('index');
             });
@@ -275,26 +275,26 @@ describe('templates', function () {
             });
 
             it('will return correct view for a tag', function () {
-                var view = _private.getTemplateForChannel({name: 'tag', slugParam: 'design', slugTemplate: true});
+                var view = _private.getTemplateForCollection({name: 'tag', slugParam: 'design', slugTemplate: true});
                 should.exist(view);
                 view.should.eql('tag-design');
             });
 
             it('will return correct view for a tag', function () {
-                var view = _private.getTemplateForChannel({name: 'tag', slugParam: 'development', slugTemplate: true});
+                var view = _private.getTemplateForCollection({name: 'tag', slugParam: 'development', slugTemplate: true});
                 should.exist(view);
                 view.should.eql('tag');
             });
         });
 
         it('will fall back to index even if no index.hbs', function () {
-            var view = _private.getTemplateForChannel({name: 'tag', slugParam: 'development', slugTemplate: true});
+            var view = _private.getTemplateForCollection({name: 'tag', slugParam: 'development', slugTemplate: true});
             should.exist(view);
             view.should.eql('index');
         });
     });
 
-    describe('[private] getTemplateForError', function () {
+    describe('[private fn] getTemplateForError', function () {
         beforeEach(function () {
             hasTemplateStub = sandbox.stub().returns(false);
 
@@ -373,7 +373,7 @@ describe('templates', function () {
         });
     });
 
-    describe('setTemplate', function () {
+    describe('fn: setTemplate', function () {
         var stubs = {}, req, res, data;
 
         beforeEach(function () {
@@ -385,7 +385,7 @@ describe('templates', function () {
 
             stubs.pickTemplate = sandbox.stub(_private, 'pickTemplate').returns('testFromPickTemplate');
             stubs.getTemplateForEntry = sandbox.stub(_private, 'getTemplateForEntry').returns('testFromEntry');
-            stubs.getTemplateForChannel = sandbox.stub(_private, 'getTemplateForChannel').returns('testFromChannel');
+            stubs.getTemplateForCollection = sandbox.stub(_private, 'getTemplateForCollection').returns('testFromCollection');
             stubs.getTemplateForError = sandbox.stub(_private, 'getTemplateForError').returns('testFromError');
         });
 
@@ -402,7 +402,7 @@ describe('templates', function () {
             // And nothing got called
             stubs.pickTemplate.called.should.be.false();
             stubs.getTemplateForEntry.called.should.be.false();
-            stubs.getTemplateForChannel.called.should.be.false();
+            stubs.getTemplateForCollection.called.should.be.false();
             stubs.getTemplateForError.called.should.be.false();
         });
 
@@ -418,7 +418,7 @@ describe('templates', function () {
             // And nothing got called
             stubs.pickTemplate.called.should.be.false();
             stubs.getTemplateForEntry.called.should.be.false();
-            stubs.getTemplateForChannel.called.should.be.false();
+            stubs.getTemplateForCollection.called.should.be.false();
             stubs.getTemplateForError.called.should.be.false();
         });
 
@@ -438,7 +438,7 @@ describe('templates', function () {
             // Only pickTemplate got called
             stubs.pickTemplate.called.should.be.true();
             stubs.getTemplateForEntry.called.should.be.false();
-            stubs.getTemplateForChannel.called.should.be.false();
+            stubs.getTemplateForCollection.called.should.be.false();
             stubs.getTemplateForError.called.should.be.false();
 
             stubs.pickTemplate.calledWith('test', 'path/to/local/test.hbs').should.be.true();
@@ -460,7 +460,7 @@ describe('templates', function () {
             // Only pickTemplate got called
             stubs.pickTemplate.called.should.be.true();
             stubs.getTemplateForEntry.called.should.be.false();
-            stubs.getTemplateForChannel.called.should.be.false();
+            stubs.getTemplateForCollection.called.should.be.false();
             stubs.getTemplateForError.called.should.be.false();
 
             stubs.pickTemplate.calledWith('test', 'path/to/local/test.hbs').should.be.true();
@@ -483,32 +483,34 @@ describe('templates', function () {
             // Only pickTemplate got called
             stubs.pickTemplate.called.should.be.false();
             stubs.getTemplateForEntry.called.should.be.true();
-            stubs.getTemplateForChannel.called.should.be.false();
+            stubs.getTemplateForCollection.called.should.be.false();
             stubs.getTemplateForError.called.should.be.false();
 
             stubs.getTemplateForEntry.calledWith({slug: 'test'}).should.be.true();
         });
 
-        it('calls getTemplateForChannel for channel routes', function () {
+        it('calls getTemplateForCollection for type collection', function () {
+            req.url = '/';
+            req.params = {};
+
             res._route = {
-                type: 'channel'
+                type: 'collection'
             };
 
-            res.locals.channel = {testChannel: 'test'};
+            res.locals.routerOptions = {testCollection: 'test'};
 
             // Call setTemplate
             templates.setTemplate(req, res, data);
 
-            // should be testFromChannel
-            res._template.should.eql('testFromChannel');
+            res._template.should.eql('testFromCollection');
 
             // Only pickTemplate got called
             stubs.pickTemplate.called.should.be.false();
             stubs.getTemplateForEntry.called.should.be.false();
-            stubs.getTemplateForChannel.called.should.be.true();
+            stubs.getTemplateForCollection.called.should.be.true();
             stubs.getTemplateForError.called.should.be.false();
 
-            stubs.getTemplateForChannel.calledWith({testChannel: 'test'}).should.be.true();
+            stubs.getTemplateForCollection.calledWith({testCollection: 'test'}).should.be.true();
         });
 
         it('calls getTemplateForError if there is an error', function () {
@@ -532,7 +534,7 @@ describe('templates', function () {
             // Only pickTemplate got called
             stubs.pickTemplate.called.should.be.false();
             stubs.getTemplateForEntry.called.should.be.false();
-            stubs.getTemplateForChannel.called.should.be.false();
+            stubs.getTemplateForCollection.called.should.be.false();
             stubs.getTemplateForError.called.should.be.true();
 
             stubs.getTemplateForError.calledWith(404).should.be.true();
diff --git a/core/test/unit/services/routing/middlewares/page-param_spec.js b/core/test/unit/services/routing/middlewares/page-param_spec.js
new file mode 100644
index 0000000000..7334a9f85f
--- /dev/null
+++ b/core/test/unit/services/routing/middlewares/page-param_spec.js
@@ -0,0 +1,77 @@
+const should = require('should'),
+    sinon = require('sinon'),
+    common = require('../../../../../server/lib/common'),
+    urlService = require('../../../../../server/services/url'),
+    middlewares = require('../../../../../server/services/routing/middlewares'),
+    sandbox = sinon.sandbox.create();
+
+describe('UNIT: services/routing/middlewares/page-param', function () {
+    let req, res, next;
+
+    beforeEach(function () {
+        req = sandbox.stub();
+        req.params = {};
+
+        res = sandbox.stub();
+        next = sandbox.stub();
+
+        sandbox.stub(urlService.utils, 'redirect301');
+    });
+
+    afterEach(function () {
+        sandbox.restore();
+    });
+
+    it('success', function () {
+        req.originalUrl = 'http://localhost:2368/blog/page/2/';
+        req.url = '/blog/page/2/';
+
+        middlewares.pageParam(req, res, next, 2);
+
+        urlService.utils.redirect301.called.should.be.false();
+        next.calledOnce.should.be.true();
+        req.params.page.should.eql(2);
+    });
+
+    it('redirect for /page/1/', function () {
+        req.originalUrl = 'http://localhost:2368/blog/page/1/';
+        req.url = '/blog/page/1/';
+
+        middlewares.pageParam(req, res, next, 1);
+
+        urlService.utils.redirect301.calledOnce.should.be.true();
+        next.called.should.be.false();
+    });
+
+    it('404 for /page/0/', function () {
+        req.originalUrl = 'http://localhost:2368/blog/page/0/';
+        req.url = '/blog/page/0/';
+
+        middlewares.pageParam(req, res, next, 0);
+
+        urlService.utils.redirect301.called.should.be.false();
+        next.calledOnce.should.be.true();
+        (next.args[0][0] instanceof common.errors.NotFoundError).should.be.true();
+    });
+
+    it('404 for /page/something/', function () {
+        req.originalUrl = 'http://localhost:2368/blog/page/something/';
+        req.url = '/blog/page/something/';
+
+        middlewares.pageParam(req, res, next, 'something');
+
+        urlService.utils.redirect301.called.should.be.false();
+        next.calledOnce.should.be.true();
+        (next.args[0][0] instanceof common.errors.NotFoundError).should.be.true();
+    });
+
+    it('redirect for /rss/page/1/', function () {
+        req.originalUrl = 'http://localhost:2368/blog/rss/page/1/';
+        req.url = '/blog/rss/page/1/';
+
+        middlewares.pageParam(req, res, next, 1);
+
+        urlService.utils.redirect301.calledOnce.should.be.true();
+        next.called.should.be.false();
+    });
+});
diff --git a/core/test/unit/services/rss/generate-feed_spec.js b/core/test/unit/services/rss/generate-feed_spec.js
index 50e8e8b0d7..ae9cb5a50a 100644
--- a/core/test/unit/services/rss/generate-feed_spec.js
+++ b/core/test/unit/services/rss/generate-feed_spec.js
@@ -1,9 +1,11 @@
 var should = require('should'),
+    sinon = require('sinon'),
     _ = require('lodash'),
     testUtils = require('../../../utils'),
     configUtils = require('../../../utils/configUtils'),
-
-    generateFeed = require('../../../../server/services/rss/generate-feed');
+    urlService = require('../../../../server/services/url'),
+    generateFeed = require('../../../../server/services/rss/generate-feed'),
+    sandbox = sinon.sandbox.create();
 
 describe('RSS: Generate Feed', function () {
     var data = {},
@@ -13,12 +15,12 @@ describe('RSS: Generate Feed', function () {
 
     before(function () {
         posts = _.cloneDeep(testUtils.DataGenerator.forKnex.posts);
+
         posts = _.filter(posts, function filter(post) {
             return post.status === 'published' && post.page === false;
         });
 
-        _.each(posts, function (post, i) {
-            post.id = i;
+        _.each(posts, function (post) {
             post.url = '/' + post.slug + '/';
             post.primary_author = {name: 'Joe Bloggs'};
         });
@@ -26,11 +28,14 @@ describe('RSS: Generate Feed', function () {
 
     afterEach(function () {
         configUtils.restore();
+        sandbox.restore();
     });
 
     beforeEach(function () {
         configUtils.set({url: 'http://my-ghost-blog.com'});
 
+        sandbox.stub(urlService, 'getUrlByResourceId');
+
         baseUrl = '/rss/';
 
         data.safeVersion = '0.6';
@@ -72,6 +77,10 @@ describe('RSS: Generate Feed', function () {
     it('should get the item tags correct', function (done) {
         data.posts = posts;
 
+        _.each(data.posts, function (post) {
+            urlService.getUrlByResourceId.withArgs(post.id, {secure: undefined, absolute: true}).returns('http://my-ghost-blog.com/' + post.slug + '/');
+        });
+
         generateFeed(baseUrl, data).then(function (xmlData) {
             should.exist(xmlData);
 
@@ -163,6 +172,10 @@ describe('RSS: Generate Feed', function () {
     it('should use excerpt when no meta_description is set', function (done) {
         data.posts = [posts[0]];
 
+        _.each(data.posts, function (post) {
+            urlService.getUrlByResourceId.withArgs(post.id, {secure: undefined, absolute: true}).returns('http://my-ghost-blog.com/' + post.slug + '/');
+        });
+
         generateFeed(baseUrl, data).then(function (xmlData) {
             should.exist(xmlData);
 
diff --git a/core/test/unit/services/settings/loader_spec.js b/core/test/unit/services/settings/loader_spec.js
index 2b13baa7eb..4e5b7194a8 100644
--- a/core/test/unit/services/settings/loader_spec.js
+++ b/core/test/unit/services/settings/loader_spec.js
@@ -23,11 +23,11 @@ describe('UNIT > Settings Service:', function () {
             routes: null,
             collections: {
                 '/': {
-                    route: '{globals.permalinks}',
+                    permalink: '{globals.permalinks}',
                     template: ['home', 'index']
                 }
             },
-            resources: {tag: '/tag/{slug}/', author: '/author/{slug}/'}
+            taxonomies: {tag: '/tag/{slug}/', author: '/author/{slug}/'}
         };
         let yamlParserStub;
 
@@ -44,7 +44,7 @@ describe('UNIT > Settings Service:', function () {
 
             const setting = loadSettings('goodroutes');
             should.exist(setting);
-            setting.should.be.an.Object().with.properties('routes', 'collections', 'resources');
+            setting.should.be.an.Object().with.properties('routes', 'collections', 'taxonomies');
             // There are 4 files in the fixtures folder, but only 1 supported and valid yaml files
             fsReadFileSpy.calledOnce.should.be.true();
             fsReadFileSpy.calledWith(expectedSettingsFile).should.be.true();
diff --git a/core/test/unit/services/settings/settings_spec.js b/core/test/unit/services/settings/settings_spec.js
index 54e14af5f5..63f51f8d90 100644
--- a/core/test/unit/services/settings/settings_spec.js
+++ b/core/test/unit/services/settings/settings_spec.js
@@ -26,7 +26,7 @@ describe('UNIT > Settings Service:', function () {
             routes: null,
             collections: {
               '/': {
-                route: '{globals.permalinks}',
+                permalink: '{globals.permalinks}',
                 template: [ 'home', 'index' ]
               }
             },
@@ -86,7 +86,7 @@ describe('UNIT > Settings Service:', function () {
                 routes: null,
                 collections: {
                   '/': {
-                    route: '{globals.permalinks}',
+                    permalink: '{globals.permalinks}',
                     template: [ 'home', 'index' ]
                   }
                 },
diff --git a/core/test/unit/services/settings/validate_spec.js b/core/test/unit/services/settings/validate_spec.js
new file mode 100644
index 0000000000..bb0ab698bc
--- /dev/null
+++ b/core/test/unit/services/settings/validate_spec.js
@@ -0,0 +1,264 @@
+const should = require('should'),
+    common = require('../../../../server/lib/common'),
+    validate = require('../../../../server/services/settings/validate');
+
+should.equal(true, true);
+
+describe('UNIT: services/settings/validate', function () {
+    it('no type definitions / empty yaml file', function () {
+        const object = validate({});
+
+        object.should.eql({collections: {}, routes: {}, taxonomies: {}});
+    });
+
+    it('throws error when using :\w+ notiation in collection', function () {
+        try {
+            validate({
+                collections: {
+                    '/magic/': {
+                        permalink: '/magic/{slug}/'
+                    },
+                    '/': {
+                        permalink: '/:slug/'
+                    }
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('throws error when using :\w+ notiation in taxonomies', function () {
+        try {
+            validate({
+                taxonomies: {
+                    tags: '/categories/:slug/'
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('throws error when permalink is missing (collection)', function () {
+        try {
+            validate({
+                collections: {
+                    permalink: '/{slug}/'
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('throws error without leading or trailing slashes', function () {
+        try {
+            validate({
+                routes: {
+                    about: 'about'
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('throws error without leading or trailing slashes', function () {
+        try {
+            validate({
+                routes: {
+                    '/about': 'about'
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('throws error without leading or trailing slashes', function () {
+        try {
+            validate({
+                routes: {
+                    'about/': 'about'
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('throws error without leading or trailing slashes', function () {
+        try {
+            validate({
+                collections: {
+                    'magic/': {
+                        permalink: '/{slug}/'
+                    }
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('throws error without leading or trailing slashes', function () {
+        try {
+            validate({
+                collections: {
+                    magic: {
+                        permalink: '/{slug}/'
+                    }
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('throws error without leading or trailing slashes', function () {
+        try {
+            validate({
+                collections: {
+                    '/magic': {
+                        permalink: '/{slug}/'
+                    }
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('throws error without leading or trailing slashes', function () {
+        try {
+            validate({
+                collections: {
+                    '/magic/': {
+                        permalink: '/{slug}'
+                    }
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('throws error without leading or trailing slashes', function () {
+        try {
+            validate({
+                collections: {
+                    '/magic/': {
+                        permalink: '{slug}'
+                    }
+                }
+            });
+        } catch (err) {
+            (err instanceof common.errors.ValidationError).should.be.true();
+            return;
+        }
+
+        throw new Error('should fail');
+    });
+
+    it('no validation error for {globals.permalinks}', function () {
+        const object = validate({
+            collections: {
+                '/magic/': {
+                    permalink: '{globals.permalinks}'
+                }
+            }
+        });
+
+        object.should.eql({
+            taxonomies: {},
+            routes: {},
+            collections: {
+                '/magic/': {
+                    permalink: '{globals.permalinks}'
+                }
+            }
+        });
+    });
+
+    it('no validation error for routes', function () {
+        validate({
+            routes: {
+                '/': 'home'
+            }
+        });
+    });
+
+    it('no validation error for / collection', function () {
+        validate({
+            collections: {
+                '/': {
+                    permalink: '/{primary_tag}/{slug}/'
+                }
+            }
+        });
+    });
+
+    it('transforms {.*} notation into :\w+', function () {
+        const object = validate({
+            collections: {
+                '/magic/': {
+                    permalink: '/magic/{year}/{slug}/'
+                },
+                '/': {
+                    permalink: '/{slug}/'
+                }
+            },
+            taxonomies: {
+                tags: '/tags/{slug}/',
+                author: '/authors/{slug}/',
+            }
+        });
+
+        object.should.eql({
+            routes: {},
+            taxonomies: {
+                tags: '/tags/:slug/',
+                author: '/authors/:slug/'
+            },
+            collections: {
+                '/magic/': {
+                    permalink: '/magic/:year/:slug/'
+                },
+                '/': {
+                    permalink: '/:slug/'
+                }
+            }
+        });
+    });
+});
diff --git a/core/test/unit/services/settings/yaml-parser_spec.js b/core/test/unit/services/settings/yaml-parser_spec.js
index f076a937c2..5a878241b4 100644
--- a/core/test/unit/services/settings/yaml-parser_spec.js
+++ b/core/test/unit/services/settings/yaml-parser_spec.js
@@ -38,7 +38,7 @@ describe('UNIT > Settings Service:', function () {
             } catch (error) {
                 should.exist(error);
                 error.message.should.eql('Could not parse badroutes.yaml: bad indentation of a mapping entry.');
-                error.context.should.eql('bad indentation of a mapping entry at line 5, column 10:\n        route: \'{globals.permalinks}\'\n             ^');
+                error.context.should.containEql('bad indentation of a mapping entry at line 5, column 14');
                 error.help.should.eql('Check your badroutes.yaml file for typos and fix the named issues.');
                 yamlSpy.calledOnce.should.be.true();
             }
diff --git a/core/test/unit/services/slack_spec.js b/core/test/unit/services/slack_spec.js
index 47aa44efe1..5cd616fb0f 100644
--- a/core/test/unit/services/slack_spec.js
+++ b/core/test/unit/services/slack_spec.js
@@ -94,7 +94,6 @@ describe('Slack', function () {
 
     describe('ping()', function () {
         var isPostStub,
-            urlForSpy,
             settingsCacheStub,
 
             slackReset,
@@ -103,7 +102,7 @@ describe('Slack', function () {
 
         beforeEach(function () {
             isPostStub = sandbox.stub(schema, 'isPost');
-            urlForSpy = sandbox.spy(urlService.utils, 'urlFor');
+            sandbox.stub(urlService, 'getUrlByResourceId');
 
             settingsCacheStub = sandbox.stub(settingsCache, 'get');
             sandbox.spy(common.logging, 'error');
@@ -122,23 +121,26 @@ describe('Slack', function () {
         it('makes a request for a post if url is provided', function () {
             var requestUrl, requestData;
 
+            const post = testUtils.DataGenerator.forKnex.createPost({slug: 'test'});
+            urlService.getUrlByResourceId.withArgs(post.id, {absolute: true}).returns('http://myblog.com/' + post.slug + '/');
+
             isPostStub.returns(true);
             settingsCacheStub.withArgs('slack').returns(slackObjWithUrl);
 
             // execute code
-            ping({});
+            ping(post);
 
             // assertions
             makeRequestStub.calledOnce.should.be.true();
             isPostStub.calledOnce.should.be.true();
-            urlForSpy.calledTwice.should.be.true();
+            urlService.getUrlByResourceId.calledOnce.should.be.true();
             settingsCacheStub.calledWith('slack').should.be.true();
 
             requestUrl = makeRequestStub.firstCall.args[0];
             requestData = JSON.parse(makeRequestStub.firstCall.args[1].body);
 
             requestUrl.should.equal(slackObjWithUrl[0].url);
-            requestData.text.should.eql('http://myblog.com/');
+            requestData.text.should.eql('http://myblog.com/test/');
             requestData.icon_url.should.equal('http://myblog.com/favicon.ico');
             requestData.username.should.equal('Ghost');
             requestData.unfurl_links.should.equal(true);
@@ -158,7 +160,7 @@ describe('Slack', function () {
             // assertions
             makeRequestStub.calledOnce.should.be.true();
             isPostStub.calledOnce.should.be.true();
-            urlForSpy.calledOnce.should.be.true();
+            urlService.getUrlByResourceId.called.should.be.false();
             settingsCacheStub.calledWith('slack').should.be.true();
 
             requestUrl = makeRequestStub.firstCall.args[0];
@@ -189,60 +191,46 @@ describe('Slack', function () {
         });
 
         it('does not make a request if post is a page', function () {
-            // set up
+            const post = testUtils.DataGenerator.forKnex.createPost({page: true});
             isPostStub.returns(true);
             settingsCacheStub.withArgs('slack').returns(slackObjWithUrl);
 
             // execute code
-            ping({page: true});
+            ping(post);
 
             // assertions
             makeRequestStub.calledOnce.should.be.false();
             isPostStub.calledOnce.should.be.true();
-            urlForSpy.calledOnce.should.be.true();
-            settingsCacheStub.calledWith('slack').should.be.true();
-        });
-
-        it('does not make a request if no url is provided', function () {
-            // set up
-            isPostStub.returns(true);
-            settingsCacheStub.withArgs('slack').returns(slackObjNoUrl);
-
-            // execute code
-            ping({});
-            // assertions
-            makeRequestStub.calledOnce.should.be.false();
-            isPostStub.calledOnce.should.be.true();
-            urlForSpy.calledOnce.should.be.true();
+            urlService.getUrlByResourceId.calledOnce.should.be.true();
             settingsCacheStub.calledWith('slack').should.be.true();
         });
 
         it('does not send webhook for \'welcome\' post', function () {
-            // set up
+            const post = testUtils.DataGenerator.forKnex.createPost({slug: 'welcome'});
             isPostStub.returns(true);
             settingsCacheStub.withArgs('slack').returns(slackObjWithUrl);
 
             // execute code
-            ping({slug: 'welcome'});
+            ping(post);
 
             // assertions
             makeRequestStub.calledOnce.should.be.false();
             isPostStub.calledOnce.should.be.true();
-            urlForSpy.calledOnce.should.be.true();
+            urlService.getUrlByResourceId.calledOnce.should.be.true();
             settingsCacheStub.calledWith('slack').should.be.true();
         });
 
         it('handles broken slack settings', function () {
-            // set up
+            const post = testUtils.DataGenerator.forKnex.createPost({slug: 'any'});
             settingsCacheStub.withArgs('slack').returns();
 
             // execute code
-            ping({});
+            ping(post);
 
             // assertions
             makeRequestStub.calledOnce.should.be.false();
             isPostStub.calledOnce.should.be.true();
-            urlForSpy.calledOnce.should.be.false();
+            urlService.getUrlByResourceId.called.should.be.false();
             settingsCacheStub.calledWith('slack').should.be.true();
         });
     });
diff --git a/core/test/unit/services/url/UrlGenerator_spec.js b/core/test/unit/services/url/UrlGenerator_spec.js
index da37312f1b..2a7bfcd879 100644
--- a/core/test/unit/services/url/UrlGenerator_spec.js
+++ b/core/test/unit/services/url/UrlGenerator_spec.js
@@ -1,14 +1,14 @@
-
 const _ = require('lodash');
 const Promise = require('bluebird');
 const should = require('should');
 const jsonpath = require('jsonpath');
 const sinon = require('sinon');
+const urlUtils = require('../../../../server/services/url/utils');
 const UrlGenerator = require('../../../../server/services/url/UrlGenerator');
 const sandbox = sinon.sandbox.create();
 
 describe('Unit: services/url/UrlGenerator', function () {
-    let queue, routingType, urls, resources, resource, resource2;
+    let queue, router, urls, resources, resource, resource2;
 
     beforeEach(function () {
         queue = {
@@ -16,7 +16,7 @@ describe('Unit: services/url/UrlGenerator', function () {
             start: sandbox.stub()
         };
 
-        routingType = {
+        router = {
             getFilter: sandbox.stub(),
             addListener: sandbox.stub(),
             getType: sandbox.stub(),
@@ -57,21 +57,21 @@ describe('Unit: services/url/UrlGenerator', function () {
     });
 
     it('ensure listeners', function () {
-        const urlGenerator = new UrlGenerator(routingType, queue);
+        const urlGenerator = new UrlGenerator(router, queue);
 
         queue.register.calledTwice.should.be.true();
-        routingType.addListener.calledOnce.should.be.true();
+        router.addListener.calledOnce.should.be.true();
         should.not.exist(urlGenerator.filter);
     });
 
     it('routing type has filter', function () {
-        routingType.getFilter.returns('featured:true');
-        const urlGenerator = new UrlGenerator(routingType, queue);
+        router.getFilter.returns('featured:true');
+        const urlGenerator = new UrlGenerator(router, queue);
         urlGenerator.filter.should.eql('$[?(@.featured == true)]');
     });
 
     it('routing type has changed', function () {
-        const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+        const urlGenerator = new UrlGenerator(router, queue, resources, urls);
 
         sandbox.stub(urlGenerator, '_try');
 
@@ -93,7 +93,7 @@ describe('Unit: services/url/UrlGenerator', function () {
             id: 'object-id-1'
         };
 
-        routingType.addListener.args[0][1]();
+        router.addListener.args[0][1]();
         urls.removeResourceId.calledTwice.should.be.true();
         resource.release.calledOnce.should.be.true();
         resource2.release.calledOnce.should.be.true();
@@ -102,10 +102,10 @@ describe('Unit: services/url/UrlGenerator', function () {
 
     describe('fn: _onInit', function () {
         it('1 resource', function () {
-            routingType.getType.returns('posts');
+            router.getType.returns('posts');
             resources.getAllByType.withArgs('posts').returns([resource]);
 
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+            const urlGenerator = new UrlGenerator(router, queue, resources, urls);
             sandbox.stub(urlGenerator, '_try');
 
             urlGenerator._onInit();
@@ -113,10 +113,10 @@ describe('Unit: services/url/UrlGenerator', function () {
         });
 
         it('no resource', function () {
-            routingType.getType.returns('posts');
+            router.getType.returns('posts');
             resources.getAllByType.withArgs('posts').returns([]);
 
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+            const urlGenerator = new UrlGenerator(router, queue, resources, urls);
             sandbox.stub(urlGenerator, '_try');
 
             urlGenerator._onInit();
@@ -126,10 +126,10 @@ describe('Unit: services/url/UrlGenerator', function () {
 
     describe('fn: _onAdded', function () {
         it('type is equal', function () {
-            routingType.getType.returns('posts');
+            router.getType.returns('posts');
             resources.getByIdAndType.withArgs('posts', 1).returns(resource);
 
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+            const urlGenerator = new UrlGenerator(router, queue, resources, urls);
             sandbox.stub(urlGenerator, '_try');
 
             urlGenerator._onAdded({id: 1, type: 'posts'});
@@ -137,9 +137,9 @@ describe('Unit: services/url/UrlGenerator', function () {
         });
 
         it('type is not equal', function () {
-            routingType.getType.returns('pages');
+            router.getType.returns('pages');
 
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+            const urlGenerator = new UrlGenerator(router, queue, resources, urls);
             sandbox.stub(urlGenerator, '_try');
 
             urlGenerator._onAdded({id: 1, type: 'posts'});
@@ -150,12 +150,12 @@ describe('Unit: services/url/UrlGenerator', function () {
     describe('fn: _try', function () {
         describe('no filter', function () {
             it('resource is not taken', function () {
-                routingType.getFilter.returns(false);
-                routingType.getType.returns('posts');
+                router.getFilter.returns(false);
+                router.getType.returns('posts');
                 resource.isReserved.returns(false);
                 sandbox.stub(jsonpath, 'query');
 
-                const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+                const urlGenerator = new UrlGenerator(router, queue, resources, urls);
                 sandbox.stub(urlGenerator, '_generateUrl').returns('something');
                 sandbox.stub(urlGenerator, '_resourceListeners');
 
@@ -169,12 +169,12 @@ describe('Unit: services/url/UrlGenerator', function () {
             });
 
             it('resource is taken', function () {
-                routingType.getFilter.returns(false);
-                routingType.getType.returns('posts');
+                router.getFilter.returns(false);
+                router.getType.returns('posts');
                 resource.isReserved.returns(true);
                 sandbox.stub(jsonpath, 'query');
 
-                const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+                const urlGenerator = new UrlGenerator(router, queue, resources, urls);
                 sandbox.stub(urlGenerator, '_generateUrl').returns('something');
                 sandbox.stub(urlGenerator, '_resourceListeners');
 
@@ -190,12 +190,12 @@ describe('Unit: services/url/UrlGenerator', function () {
 
         describe('custom filter', function () {
             it('matches', function () {
-                routingType.getFilter.returns('featured:true');
-                routingType.getType.returns('posts');
+                router.getFilter.returns('featured:true');
+                router.getType.returns('posts');
                 resource.isReserved.returns(false);
                 sandbox.stub(jsonpath, 'query').returns([true]);
 
-                const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+                const urlGenerator = new UrlGenerator(router, queue, resources, urls);
                 sandbox.stub(urlGenerator, '_generateUrl').returns('something');
                 sandbox.stub(urlGenerator, '_resourceListeners');
 
@@ -209,12 +209,12 @@ describe('Unit: services/url/UrlGenerator', function () {
             });
 
             it('no match', function () {
-                routingType.getFilter.returns('featured:true');
-                routingType.getType.returns('posts');
+                router.getFilter.returns('featured:true');
+                router.getType.returns('posts');
                 resource.isReserved.returns(false);
                 sandbox.stub(jsonpath, 'query').returns([]);
 
-                const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+                const urlGenerator = new UrlGenerator(router, queue, resources, urls);
                 sandbox.stub(urlGenerator, '_generateUrl').returns('something');
                 sandbox.stub(urlGenerator, '_resourceListeners');
 
@@ -228,12 +228,12 @@ describe('Unit: services/url/UrlGenerator', function () {
             });
 
             it('resource is taken', function () {
-                routingType.getFilter.returns('featured:true');
-                routingType.getType.returns('posts');
+                router.getFilter.returns('featured:true');
+                router.getType.returns('posts');
                 resource.isReserved.returns(true);
                 sandbox.stub(jsonpath, 'query').returns([]);
 
-                const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+                const urlGenerator = new UrlGenerator(router, queue, resources, urls);
                 sandbox.stub(urlGenerator, '_generateUrl').returns('something');
                 sandbox.stub(urlGenerator, '_resourceListeners');
 
@@ -250,68 +250,23 @@ describe('Unit: services/url/UrlGenerator', function () {
 
     describe('fn: _generateUrl', function () {
         it('returns url', function () {
-            routingType.getPermalinks.returns({
+            router.getPermalinks.returns({
                 getValue: function () {
                     return '/:slug/';
                 }
             });
 
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
-            sandbox.stub(urlGenerator, '_replacePermalink').returns('/url');
+            const urlGenerator = new UrlGenerator(router, queue, resources, urls);
+            sandbox.stub(urlUtils, 'replacePermalink').returns('/url');
 
-            urlGenerator._generateUrl(resource).should.eql('/url');
-            urlGenerator._replacePermalink.calledWith('/:slug/', resource).should.be.true();
-        });
-    });
-
-    describe('fn: _replacePermalink', function () {
-        it('/:slug/', function () {
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
-            resource.data = {
-                slug: 'welcome'
-            };
-
-            urlGenerator._replacePermalink('/:slug/', resource).should.eql('/welcome/');
-        });
-
-        it('/:year/:slug/', function () {
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
-            resource.data = {
-                slug: 'welcome',
-                published_at: '2017-04-13T20:00:53.584Z'
-            };
-
-            urlGenerator._replacePermalink('/:year/:slug/', resource).should.eql('/2017/welcome/');
-        });
-
-        it('/:author/:slug/', function () {
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
-            resource.data = {
-                slug: 'welcome',
-                primary_author: {
-                    slug: 'joe'
-                }
-            };
-
-            urlGenerator._replacePermalink('/:author/:slug/', resource).should.eql('/joe/welcome/');
-        });
-
-        it('/:primary_tag/:slug/', function () {
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
-            resource.data = {
-                slug: 'welcome',
-                primary_tag: {
-                    slug: 'football'
-                }
-            };
-
-            urlGenerator._replacePermalink('/:primary_tag/:slug/', resource).should.eql('/football/welcome/');
+            urlGenerator._generateUrl(resource).should.eql('/url/');
+            urlUtils.replacePermalink.calledWith('/:slug/', resource.data).should.be.true();
         });
     });
 
     describe('fn: _resourceListeners', function () {
         it('ensure events', function () {
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+            const urlGenerator = new UrlGenerator(router, queue, resources, urls);
 
             urlGenerator._resourceListeners(resource);
             resource.removeAllListeners.calledOnce.should.be.true();
@@ -319,7 +274,7 @@ describe('Unit: services/url/UrlGenerator', function () {
         });
 
         it('url has not changed', function () {
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+            const urlGenerator = new UrlGenerator(router, queue, resources, urls);
             sandbox.stub(urlGenerator, '_generateUrl').returns('/welcome/');
             sandbox.stub(urlGenerator, '_try').returns(true);
 
@@ -337,7 +292,7 @@ describe('Unit: services/url/UrlGenerator', function () {
         });
 
         it('url has changed, but is still mine', function () {
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+            const urlGenerator = new UrlGenerator(router, queue, resources, urls);
             sandbox.stub(urlGenerator, '_generateUrl').returns('/salute/');
             sandbox.stub(urlGenerator, '_try').returns(true);
 
@@ -355,7 +310,7 @@ describe('Unit: services/url/UrlGenerator', function () {
         });
 
         it('url has changed and is no longer mine (e.g. filter does not match anymore)', function () {
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+            const urlGenerator = new UrlGenerator(router, queue, resources, urls);
             sandbox.stub(urlGenerator, '_generateUrl').returns('/salute/');
             sandbox.stub(urlGenerator, '_try').returns(false);
 
@@ -374,7 +329,7 @@ describe('Unit: services/url/UrlGenerator', function () {
         });
 
         it('resource got removed', function () {
-            const urlGenerator = new UrlGenerator(routingType, queue, resources, urls);
+            const urlGenerator = new UrlGenerator(router, queue, resources, urls);
             urlGenerator._resourceListeners(resource);
 
             resource.data = {
diff --git a/core/test/unit/services/url/UrlService_spec.js b/core/test/unit/services/url/UrlService_spec.js
index 0ab346f7f8..8e8f52e9d4 100644
--- a/core/test/unit/services/url/UrlService_spec.js
+++ b/core/test/unit/services/url/UrlService_spec.js
@@ -1,740 +1,241 @@
-
 const _ = require('lodash');
 const Promise = require('bluebird');
+const rewire = require('rewire');
 const should = require('should');
 const sinon = require('sinon');
-const testUtils = require('../../../utils');
-const configUtils = require('../../../utils/configUtils');
-const models = require('../../../../server/models');
 const common = require('../../../../server/lib/common');
-const UrlService = require('../../../../server/services/url/UrlService');
+const Queue = require('../../../../server/services/url/Queue');
+const Resources = require('../../../../server/services/url/Resources');
+const UrlGenerator = require('../../../../server/services/url/UrlGenerator');
+const Urls = require('../../../../server/services/url/Urls');
+const UrlService = rewire('../../../../server/services/url/UrlService');
 const sandbox = sinon.sandbox.create();
 
 describe('Unit: services/url/UrlService', function () {
-    let knexMock, urlService;
-
-    before(function () {
-        models.init();
-
-        // @NOTE: we auto create a singleton - as soon as you require the file, it will listen on events
-        require('../../../../server/services/url').reset();
-    });
+    let QueueStub, ResourcesStub, UrlsStub, UrlGeneratorStub, urlService;
 
     beforeEach(function () {
-        knexMock = new testUtils.mocks.knex();
-        knexMock.mock();
+        QueueStub = sandbox.stub();
+        QueueStub.returns(sandbox.createStubInstance(Queue));
+
+        ResourcesStub = sandbox.stub();
+        ResourcesStub.returns(sandbox.createStubInstance(Resources));
+
+        UrlsStub = sandbox.stub();
+        UrlsStub.returns(sandbox.createStubInstance(Urls));
+
+        UrlGeneratorStub = sandbox.stub();
+        UrlGeneratorStub.returns(sandbox.createStubInstance(UrlGenerator));
+
+        UrlService.__set__('Queue', QueueStub);
+        UrlService.__set__('Resources', ResourcesStub);
+        UrlService.__set__('Urls', UrlsStub);
+        UrlService.__set__('UrlGenerator', UrlGeneratorStub);
+
+        sandbox.stub(common.events, 'on');
+
+        urlService = new UrlService();
     });
 
     afterEach(function () {
         sandbox.restore();
     });
 
-    afterEach(function () {
-        knexMock.unmock();
+    it('instantiate', function () {
+        should.exist(urlService.utils);
+        should.exist(urlService.urls);
+        should.exist(urlService.resources);
+        should.exist(urlService.queue);
+
+        urlService.urlGenerators.should.eql([]);
+        urlService.hasFinished().should.be.false();
+
+        urlService.queue.addListener.calledTwice.should.be.true();
+        urlService.queue.addListener.args[0][0].should.eql('started');
+        urlService.queue.addListener.args[1][0].should.eql('ended');
+
+        common.events.on.calledOnce.should.be.true();
+        common.events.on.args[0][0].should.eql('router.created');
     });
 
-    after(function () {
-        sandbox.restore();
+    it('fn: _onQueueStarted', function () {
+        urlService._onQueueStarted('init');
+        urlService.hasFinished().should.be.false();
     });
 
-    describe('functional: default routing set', function () {
-        let routingType1, routingType2, routingType3, routingType4;
+    it('fn: _onQueueEnded', function () {
+        urlService._onQueueEnded('init');
+        urlService.hasFinished().should.be.true();
+    });
 
-        beforeEach(function (done) {
-            urlService = new UrlService();
+    it('fn: _onRouterAddedType', function () {
+        urlService._onRouterAddedType({getPermalinks: sandbox.stub().returns({})});
+        urlService.urlGenerators.length.should.eql(1);
+    });
 
-            routingType1 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'post collection';
-                }
-            };
+    describe('fn: getResource', function () {
+        it('no resource for url found', function () {
+            urlService.finished = false;
+            urlService.urls.getByUrl.withArgs('/blog-post/').returns([]);
 
-            routingType2 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'authors';
-                }
-            };
-
-            routingType3 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'tags';
-                }
-            };
-
-            routingType4 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'static pages';
-                }
-            };
-
-            routingType1.getFilter.returns('featured:false');
-            routingType1.getType.returns('posts');
-            routingType1.getPermalinks.returns({
-                getValue: function () {
-                    return '/:slug/';
-                }
-            });
-
-            routingType2.getFilter.returns(false);
-            routingType2.getType.returns('users');
-            routingType2.getPermalinks.returns({
-                getValue: function () {
-                    return '/author/:slug/';
-                }
-            });
-
-            routingType3.getFilter.returns(false);
-            routingType3.getType.returns('tags');
-            routingType3.getPermalinks.returns({
-                getValue: function () {
-                    return '/tag/:slug/';
-                }
-            });
-
-            routingType4.getFilter.returns(false);
-            routingType4.getType.returns('pages');
-            routingType4.getPermalinks.returns({
-                getValue: function () {
-                    return '/:slug/';
-                }
-            });
-
-            common.events.emit('routingType.created', routingType1);
-            common.events.emit('routingType.created', routingType2);
-            common.events.emit('routingType.created', routingType3);
-            common.events.emit('routingType.created', routingType4);
-
-            common.events.emit('db.ready');
-
-            let timeout;
-            (function retry() {
-                clearTimeout(timeout);
-
-                if (urlService.hasFinished()) {
-                    return done();
-                }
-
-                setTimeout(retry, 50);
-            })();
+            try {
+                urlService.getResource('/blog-post/');
+                throw new Error('Expected error.');
+            } catch (err) {
+                (err instanceof common.errors.InternalServerError).should.be.true();
+            }
         });
 
-        afterEach(function () {
-            urlService.reset();
+        it('no resource for url found', function () {
+            urlService.finished = true;
+            urlService.urls.getByUrl.withArgs('/blog-post/').returns([]);
+            should.not.exist(urlService.getResource('/blog-post/'));
         });
 
-        it('check url generators', function () {
-            urlService.urlGenerators.length.should.eql(4);
-            urlService.urlGenerators[0].routingType.should.eql(routingType1);
-            urlService.urlGenerators[1].routingType.should.eql(routingType2);
-            urlService.urlGenerators[2].routingType.should.eql(routingType3);
-            urlService.urlGenerators[3].routingType.should.eql(routingType4);
+        it('one resource for url found', function () {
+            const resource = {x: 'y'};
+
+            urlService.finished = true;
+            urlService.urls.getByUrl.withArgs('/blog-post/').returns([{resource: resource}]);
+            urlService.getResource('/blog-post/').should.eql(resource);
         });
 
-        it('getUrl', function () {
-            urlService.urlGenerators.forEach(function (generator) {
-                if (generator.routingType.getType() === 'posts') {
-                    generator.getUrls().length.should.eql(2);
+        it('two resources for url found', function () {
+            const object1 = {generatorId: 1, resource: {a: 1}};
+            const object2 = {generatorId: 0, resource: {a: 2}};
+
+            urlService.urlGenerators = [
+                {
+                    uid: 0
+                },
+                {
+                    uid: 1
                 }
+            ];
 
-                if (generator.routingType.getType() === 'pages') {
-                    generator.getUrls().length.should.eql(1);
-                }
-
-                if (generator.routingType.getType() === 'tags') {
-                    generator.getUrls().length.should.eql(5);
-                }
-
-                if (generator.routingType.getType() === 'users') {
-                    generator.getUrls().length.should.eql(5);
-                }
-            });
-
-            let url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[0].id);
-            url.should.eql('/html-ipsum/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[1].id);
-            url.should.eql('/ghostly-kitchen-sink/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[2].id);
-            should.not.exist(url);
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[0].id);
-            url.should.eql('/tag/kitchen-sink/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[1].id);
-            url.should.eql('/tag/bacon/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[2].id);
-            url.should.eql('/tag/chorizo/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[3].id);
-            url.should.eql('/tag/pollo/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[4].id);
-            url.should.eql('/tag/injection/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[0].id);
-            url.should.eql('/author/joe-bloggs/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[1].id);
-            url.should.eql('/author/smith-wellingsworth/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[2].id);
-            url.should.eql('/author/jimothy-bogendath/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[3].id);
-            url.should.eql('/author/slimer-mcectoplasm/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[4].id);
-            url.should.eql('/author/contributor/');
+            urlService.finished = true;
+            urlService.urls.getByUrl.withArgs('/blog-post/').returns([object1, object2]);
+            urlService.getResource('/blog-post/').should.eql(object2.resource);
         });
 
-        it('getResource', function () {
-            let resource = urlService.getResource('/html-ipsum/');
-            resource.data.id.should.eql(testUtils.DataGenerator.forKnex.posts[0].id);
+        it('two resources for url found', function () {
+            const object1 = {generatorId: 0, resource: {a: 1}};
+            const object2 = {generatorId: 1, resource: {a: 2}};
 
-            resource = urlService.getResource('/does-not-exist/');
-            should.not.exist(resource);
-        });
+            urlService.urlGenerators = [
+                {
+                    uid: 0
+                },
+                {
+                    uid: 1
+                }
+            ];
 
-        describe('update resource', function () {
-            it('featured: false => featured:true', function () {
-                return models.Post.edit({featured: true}, {id: testUtils.DataGenerator.forKnex.posts[1].id})
-                    .then(function (post) {
-                        // There is no collection which owns featured posts.
-                        let url = urlService.getUrlByResourceId(post.id);
-                        should.not.exist(url);
-
-                        urlService.urlGenerators.forEach(function (generator) {
-                            if (generator.routingType.getType() === 'posts') {
-                                generator.getUrls().length.should.eql(1);
-                            }
-
-                            if (generator.routingType.getType() === 'pages') {
-                                generator.getUrls().length.should.eql(1);
-                            }
-                        });
-                    });
-            });
-
-            it('page: false => page:true', function () {
-                return models.Post.edit({page: true}, {id: testUtils.DataGenerator.forKnex.posts[1].id})
-                    .then(function (post) {
-                        let url = urlService.getUrlByResourceId(post.id);
-
-                        url.should.eql('/ghostly-kitchen-sink/');
-
-                        urlService.urlGenerators.forEach(function (generator) {
-                            if (generator.routingType.getType() === 'posts') {
-                                generator.getUrls().length.should.eql(1);
-                            }
-
-                            if (generator.routingType.getType() === 'pages') {
-                                generator.getUrls().length.should.eql(2);
-                            }
-                        });
-                    });
-            });
-
-            it('page: true => page:false', function () {
-                return models.Post.edit({page: false}, {id: testUtils.DataGenerator.forKnex.posts[5].id})
-                    .then(function (post) {
-                        let url = urlService.getUrlByResourceId(post.id);
-
-                        url.should.eql('/static-page-test/');
-
-                        urlService.urlGenerators.forEach(function (generator) {
-                            if (generator.routingType.getType() === 'posts') {
-                                generator.getUrls().length.should.eql(3);
-                            }
-
-                            if (generator.routingType.getType() === 'pages') {
-                                generator.getUrls().length.should.eql(0);
-                            }
-                        });
-                    });
-            });
-        });
-
-        describe('add new resource', function () {
-            it('already published', function () {
-                return models.Post.add({
-                    featured: false,
-                    page: false,
-                    status: 'published',
-                    title: 'Brand New Story!',
-                    author_id: testUtils.DataGenerator.forKnex.users[4].id
-                }).then(function (post) {
-                    let url = urlService.getUrlByResourceId(post.id);
-                    url.should.eql('/brand-new-story/');
-
-                    let resource = urlService.getResource(url);
-                    resource.data.primary_author.id.should.eql(testUtils.DataGenerator.forKnex.users[4].id);
-                });
-            });
-
-            it('draft', function () {
-                return models.Post.add({
-                    featured: false,
-                    page: false,
-                    status: 'draft',
-                    title: 'Brand New Story!',
-                    author_id: testUtils.DataGenerator.forKnex.users[4].id
-                }).then(function (post) {
-                    let url = urlService.getUrlByResourceId(post.id);
-                    should.not.exist(url);
-
-                    let resource = urlService.getResource(url);
-                    should.not.exist(resource);
-                });
-            });
+            urlService.finished = true;
+            urlService.urls.getByUrl.withArgs('/blog-post/').returns([object1, object2]);
+            urlService.getResource('/blog-post/').should.eql(object1.resource);
         });
     });
 
-    describe('functional: extended/modified routing set', function () {
-        let routingType1, routingType2, routingType3, routingType4, routingType5;
-
-        beforeEach(function (done) {
-            urlService = new UrlService();
-
-            routingType1 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'post collection 1';
-                }
-            };
-
-            routingType2 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'post collection 2';
-                }
-            };
-
-            routingType3 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'authors';
-                }
-            };
-
-            routingType4 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'tags';
-                }
-            };
-
-            routingType5 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'static pages';
-                }
-            };
-
-            routingType1.getFilter.returns('featured:false');
-            routingType1.getType.returns('posts');
-            routingType1.getPermalinks.returns({
-                getValue: function () {
-                    return '/collection/:year/:slug/';
-                }
+    describe('fn: getPermalinkByUrl', function () {
+        it('found', function () {
+            const permalinkStub1 = sandbox.stub().returns({
+                getValue: sandbox.stub().returns('/:slug/')
             });
 
-            routingType2.getFilter.returns('featured:true');
-            routingType2.getType.returns('posts');
-            routingType2.getPermalinks.returns({
-                getValue: function () {
-                    return '/podcast/:slug/';
-                }
+            const permalinkStub2 = sandbox.stub().returns({
+                getValue: sandbox.stub().returns('/:primary_tag/')
             });
 
-            routingType3.getFilter.returns(false);
-            routingType3.getType.returns('users');
-            routingType3.getPermalinks.returns({
-                getValue: function () {
-                    return '/persons/:slug/';
+            urlService.urlGenerators = [
+                {
+                    uid: 0,
+                    router: {
+                        getPermalinks: permalinkStub1
+                    }
+                },
+                {
+                    uid: 1,
+                    router: {
+                        getPermalinks: permalinkStub2
+                    }
                 }
-            });
+            ];
 
-            routingType4.getFilter.returns(false);
-            routingType4.getType.returns('tags');
-            routingType4.getPermalinks.returns({
-                getValue: function () {
-                    return '/category/:slug/';
-                }
-            });
+            sandbox.stub(urlService, 'getResource').withArgs('/blog-post/', {returnEverything: true})
+                .returns({generatorId: 1, resource: true});
 
-            routingType5.getFilter.returns(false);
-            routingType5.getType.returns('pages');
-            routingType5.getPermalinks.returns({
-                getValue: function () {
-                    return '/:slug/';
-                }
-            });
-
-            common.events.emit('routingType.created', routingType1);
-            common.events.emit('routingType.created', routingType2);
-            common.events.emit('routingType.created', routingType3);
-            common.events.emit('routingType.created', routingType4);
-            common.events.emit('routingType.created', routingType5);
-
-            common.events.emit('db.ready');
-
-            let timeout;
-            (function retry() {
-                clearTimeout(timeout);
-
-                if (urlService.hasFinished()) {
-                    return done();
-                }
-
-                setTimeout(retry, 50);
-            })();
+            urlService.getPermalinkByUrl('/blog-post/').should.eql('/:primary_tag/');
         });
 
-        afterEach(function () {
-            urlService.reset();
-        });
-
-        it('check url generators', function () {
-            urlService.urlGenerators.length.should.eql(5);
-            urlService.urlGenerators[0].routingType.should.eql(routingType1);
-            urlService.urlGenerators[1].routingType.should.eql(routingType2);
-            urlService.urlGenerators[2].routingType.should.eql(routingType3);
-            urlService.urlGenerators[3].routingType.should.eql(routingType4);
-            urlService.urlGenerators[4].routingType.should.eql(routingType5);
-        });
-
-        it('getUrl', function () {
-            urlService.urlGenerators.forEach(function (generator) {
-                if (generator.routingType.getType() === 'posts' && generator.routingType.getFilter() === 'featured:false') {
-                    generator.getUrls().length.should.eql(2);
-                }
-
-                if (generator.routingType.getType() === 'posts' && generator.routingType.getFilter() === 'featured:true') {
-                    generator.getUrls().length.should.eql(2);
-                }
-
-                if (generator.routingType.getType() === 'pages') {
-                    generator.getUrls().length.should.eql(1);
-                }
-
-                if (generator.routingType.getType() === 'tags') {
-                    generator.getUrls().length.should.eql(5);
-                }
-
-                if (generator.routingType.getType() === 'users') {
-                    generator.getUrls().length.should.eql(5);
-                }
+        it('found', function () {
+            const permalinkStub1 = sandbox.stub().returns({
+                getValue: sandbox.stub().returns('/:slug/')
             });
 
-            let url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[0].id);
-            url.should.eql('/collection/2015/html-ipsum/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[1].id);
-            url.should.eql('/collection/2015/ghostly-kitchen-sink/');
-
-            // featured
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[2].id);
-            url.should.eql('/podcast/short-and-sweet/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[0].id);
-            url.should.eql('/category/kitchen-sink/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[1].id);
-            url.should.eql('/category/bacon/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[2].id);
-            url.should.eql('/category/chorizo/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[3].id);
-            url.should.eql('/category/pollo/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[4].id);
-            url.should.eql('/category/injection/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[0].id);
-            url.should.eql('/persons/joe-bloggs/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[1].id);
-            url.should.eql('/persons/smith-wellingsworth/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[2].id);
-            url.should.eql('/persons/jimothy-bogendath/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[3].id);
-            url.should.eql('/persons/slimer-mcectoplasm/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[4].id);
-            url.should.eql('/persons/contributor/');
-        });
-
-        describe('update resource', function () {
-            it('featured: false => featured:true', function () {
-                return models.Post.edit({featured: true}, {id: testUtils.DataGenerator.forKnex.posts[1].id})
-                    .then(function (post) {
-                        // There is no collection which owns featured posts.
-                        let url = urlService.getUrlByResourceId(post.id);
-                        url.should.eql('/podcast/ghostly-kitchen-sink/');
-
-                        urlService.urlGenerators.forEach(function (generator) {
-                            if (generator.routingType.getType() === 'posts' && generator.routingType.getFilter() === 'featured:false') {
-                                generator.getUrls().length.should.eql(1);
-                            }
-
-                            if (generator.routingType.getType() === 'posts' && generator.routingType.getFilter() === 'featured:true') {
-                                generator.getUrls().length.should.eql(3);
-                            }
-                        });
-                    });
+            const permalinkStub2 = sandbox.stub().returns({
+                getValue: sandbox.stub().returns('/:primary_tag/')
             });
 
-            it('featured: true => featured:false', function () {
-                return models.Post.edit({featured: false}, {id: testUtils.DataGenerator.forKnex.posts[2].id})
-                    .then(function (post) {
-                        // There is no collection which owns featured posts.
-                        let url = urlService.getUrlByResourceId(post.id);
-                        url.should.eql('/collection/2015/short-and-sweet/');
+            urlService.urlGenerators = [
+                {
+                    uid: 0,
+                    router: {
+                        getPermalinks: permalinkStub1
+                    }
+                },
+                {
+                    uid: 1,
+                    router: {
+                        getPermalinks: permalinkStub2
+                    }
+                }
+            ];
 
-                        urlService.urlGenerators.forEach(function (generator) {
-                            if (generator.routingType.getType() === 'posts' && generator.routingType.getFilter() === 'featured:false') {
-                                generator.getUrls().length.should.eql(3);
-                            }
+            sandbox.stub(urlService, 'getResource').withArgs('/blog-post/', {returnEverything: true})
+                .returns({generatorId: 0, resource: true});
 
-                            if (generator.routingType.getType() === 'posts' && generator.routingType.getFilter() === 'featured:true') {
-                                generator.getUrls().length.should.eql(1);
-                            }
-                        });
-                    });
-            });
+            urlService.getPermalinkByUrl('/blog-post/').should.eql('/:slug/');
         });
     });
 
-    describe('functional: subdirectory', function () {
-        let routingType1, routingType2, routingType3, routingType4, routingType5;
-
-        beforeEach(function (done) {
-            configUtils.set('url', 'http://localhost:2388/blog');
-
-            urlService = new UrlService();
-
-            routingType1 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'post collection 1';
-                }
-            };
-
-            routingType2 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'post collection 2';
-                }
-            };
-
-            routingType3 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'authors';
-                }
-            };
-
-            routingType4 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'tags';
-                }
-            };
-
-            routingType5 = {
-                getFilter: sandbox.stub(),
-                addListener: sandbox.stub(),
-                getType: sandbox.stub(),
-                getPermalinks: sandbox.stub(),
-                toString: function () {
-                    return 'static pages';
-                }
-            };
-
-            routingType1.getFilter.returns('featured:false');
-            routingType1.getType.returns('posts');
-            routingType1.getPermalinks.returns({
-                getValue: function () {
-                    return '/collection/:year/:slug/';
-                }
-            });
-
-            routingType2.getFilter.returns('featured:true');
-            routingType2.getType.returns('posts');
-            routingType2.getPermalinks.returns({
-                getValue: function () {
-                    return '/podcast/:slug/';
-                }
-            });
-
-            routingType3.getFilter.returns(false);
-            routingType3.getType.returns('users');
-            routingType3.getPermalinks.returns({
-                getValue: function () {
-                    return '/persons/:slug/';
-                }
-            });
-
-            routingType4.getFilter.returns(false);
-            routingType4.getType.returns('tags');
-            routingType4.getPermalinks.returns({
-                getValue: function () {
-                    return '/category/:slug/';
-                }
-            });
-
-            routingType5.getFilter.returns(false);
-            routingType5.getType.returns('pages');
-            routingType5.getPermalinks.returns({
-                getValue: function () {
-                    return '/:slug/';
-                }
-            });
-
-            common.events.emit('routingType.created', routingType1);
-            common.events.emit('routingType.created', routingType2);
-            common.events.emit('routingType.created', routingType3);
-            common.events.emit('routingType.created', routingType4);
-            common.events.emit('routingType.created', routingType5);
-
-            common.events.emit('db.ready');
-
-            let timeout;
-            (function retry() {
-                clearTimeout(timeout);
-
-                if (urlService.hasFinished()) {
-                    return done();
-                }
-
-                setTimeout(retry, 50);
-            })();
+    describe('fn: getUrlByResourceId', function () {
+        it('not found', function () {
+            urlService.urls.getByResourceId.withArgs(1).returns(null);
+            urlService.getUrlByResourceId(1).should.eql('/404/');
         });
 
-        afterEach(function () {
-            urlService.reset();
-            configUtils.restore();
+        it('not found: absolute', function () {
+            urlService.utils = sandbox.stub();
+            urlService.utils.createUrl = sandbox.stub();
+
+            urlService.urls.getByResourceId.withArgs(1).returns(null);
+            urlService.getUrlByResourceId(1, {absolute: true});
+
+            urlService.utils.createUrl.calledWith('/404/', true, undefined).should.be.true();
         });
 
-        it('check url generators', function () {
-            urlService.urlGenerators.length.should.eql(5);
-            urlService.urlGenerators[0].routingType.should.eql(routingType1);
-            urlService.urlGenerators[1].routingType.should.eql(routingType2);
-            urlService.urlGenerators[2].routingType.should.eql(routingType3);
-            urlService.urlGenerators[3].routingType.should.eql(routingType4);
-            urlService.urlGenerators[4].routingType.should.eql(routingType5);
+        it('found', function () {
+            urlService.urls.getByResourceId.withArgs(1).returns({url: '/post/'});
+            urlService.getUrlByResourceId(1).should.eql('/post/');
         });
 
-        it('getUrl', function () {
-            urlService.urlGenerators.forEach(function (generator) {
-                if (generator.routingType.getType() === 'posts' && generator.routingType.getFilter() === 'featured:false') {
-                    generator.getUrls().length.should.eql(2);
-                }
+        it('found: absolute', function () {
+            urlService.utils = sandbox.stub();
+            urlService.utils.createUrl = sandbox.stub();
 
-                if (generator.routingType.getType() === 'posts' && generator.routingType.getFilter() === 'featured:true') {
-                    generator.getUrls().length.should.eql(2);
-                }
+            urlService.urls.getByResourceId.withArgs(1).returns({url: '/post/'});
+            urlService.getUrlByResourceId(1, {absolute: true});
+            urlService.utils.createUrl.calledWith('/post/', true, undefined).should.be.true();
+        });
 
-                if (generator.routingType.getType() === 'pages') {
-                    generator.getUrls().length.should.eql(1);
-                }
+        it('found: absolute + secure', function () {
+            urlService.utils = sandbox.stub();
+            urlService.utils.createUrl = sandbox.stub();
 
-                if (generator.routingType.getType() === 'tags') {
-                    generator.getUrls().length.should.eql(5);
-                }
-
-                if (generator.routingType.getType() === 'users') {
-                    generator.getUrls().length.should.eql(5);
-                }
-            });
-
-            let url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[0].id);
-            url.should.eql('/blog/collection/2015/html-ipsum/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[1].id);
-            url.should.eql('/blog/collection/2015/ghostly-kitchen-sink/');
-
-            // featured
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.posts[2].id);
-            url.should.eql('/blog/podcast/short-and-sweet/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[0].id);
-            url.should.eql('/blog/category/kitchen-sink/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[1].id);
-            url.should.eql('/blog/category/bacon/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[2].id);
-            url.should.eql('/blog/category/chorizo/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[3].id);
-            url.should.eql('/blog/category/pollo/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.tags[4].id);
-            url.should.eql('/blog/category/injection/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[0].id);
-            url.should.eql('/blog/persons/joe-bloggs/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[1].id);
-            url.should.eql('/blog/persons/smith-wellingsworth/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[2].id);
-            url.should.eql('/blog/persons/jimothy-bogendath/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[3].id);
-            url.should.eql('/blog/persons/slimer-mcectoplasm/');
-
-            url = urlService.getUrlByResourceId(testUtils.DataGenerator.forKnex.users[4].id);
-            url.should.eql('/blog/persons/contributor/');
+            urlService.urls.getByResourceId.withArgs(1).returns({url: '/post/'});
+            urlService.getUrlByResourceId(1, {absolute: true, secure: true});
+            urlService.utils.createUrl.calledWith('/post/', true, true).should.be.true();
         });
     });
 });
diff --git a/core/test/unit/services/url/utils_spec.js b/core/test/unit/services/url/utils_spec.js
index d2b03d44a8..93a4a47375 100644
--- a/core/test/unit/services/url/utils_spec.js
+++ b/core/test/unit/services/url/utils_spec.js
@@ -1,5 +1,4 @@
-
-var should = require('should'),
+const should = require('should'),
     sinon = require('sinon'),
     _ = require('lodash'),
     moment = require('moment-timezone'),
@@ -9,7 +8,6 @@ var should = require('should'),
     configUtils = require('../../../utils/configUtils'),
     testUtils = require('../../../utils'),
     config = configUtils.config,
-
     sandbox = sinon.sandbox.create();
 
 describe('Url', function () {
@@ -166,18 +164,6 @@ describe('Url', function () {
             }, true).should.equal('https://my-ghost-blog.com/blog');
         });
 
-        it('should return rss url when asked for', function () {
-            var testContext = 'rss';
-
-            configUtils.set({url: 'http://my-ghost-blog.com'});
-            urlService.utils.urlFor(testContext).should.equal('/rss/');
-            urlService.utils.urlFor(testContext, true).should.equal('http://my-ghost-blog.com/rss/');
-
-            configUtils.set({url: 'http://my-ghost-blog.com/blog'});
-            urlService.utils.urlFor(testContext).should.equal('/blog/rss/');
-            urlService.utils.urlFor(testContext, true).should.equal('http://my-ghost-blog.com/blog/rss/');
-        });
-
         it('should handle weird cases by always returning /', function () {
             urlService.utils.urlFor('').should.equal('/');
             urlService.utils.urlFor('post', {}).should.equal('/');
@@ -218,51 +204,6 @@ describe('Url', function () {
             urlService.utils.urlFor(testContext, true).should.equal('http://my-ghost-blog.com/blog/about/');
         });
 
-        it('should return url for a post from post object', function () {
-            var testContext = 'post',
-                testData = {post: _.cloneDeep(testUtils.DataGenerator.Content.posts[2])};
-
-            // url is now provided on the postmodel, permalinkSetting tests are in the model_post_spec.js test
-            testData.post.url = '/short-and-sweet/';
-            configUtils.set({url: 'http://my-ghost-blog.com'});
-            urlService.utils.urlFor(testContext, testData).should.equal('/short-and-sweet/');
-            urlService.utils.urlFor(testContext, testData, true).should.equal('http://my-ghost-blog.com/short-and-sweet/');
-
-            configUtils.set({url: 'http://my-ghost-blog.com/blog'});
-            urlService.utils.urlFor(testContext, testData).should.equal('/blog/short-and-sweet/');
-            urlService.utils.urlFor(testContext, testData, true).should.equal('http://my-ghost-blog.com/blog/short-and-sweet/');
-
-            testData.post.url = '/blog-one/';
-            urlService.utils.urlFor(testContext, testData).should.equal('/blog/blog-one/');
-            urlService.utils.urlFor(testContext, testData, true).should.equal('http://my-ghost-blog.com/blog/blog-one/');
-        });
-
-        it('should return url for a tag when asked for', function () {
-            var testContext = 'tag',
-                testData = {tag: testUtils.DataGenerator.Content.tags[0]};
-
-            configUtils.set({url: 'http://my-ghost-blog.com'});
-            urlService.utils.urlFor(testContext, testData).should.equal('/tag/kitchen-sink/');
-            urlService.utils.urlFor(testContext, testData, true).should.equal('http://my-ghost-blog.com/tag/kitchen-sink/');
-
-            configUtils.set({url: 'http://my-ghost-blog.com/blog'});
-            urlService.utils.urlFor(testContext, testData).should.equal('/blog/tag/kitchen-sink/');
-            urlService.utils.urlFor(testContext, testData, true).should.equal('http://my-ghost-blog.com/blog/tag/kitchen-sink/');
-        });
-
-        it('should return url for an author when asked for', function () {
-            var testContext = 'author',
-                testData = {author: testUtils.DataGenerator.Content.users[0]};
-
-            configUtils.set({url: 'http://my-ghost-blog.com'});
-            urlService.utils.urlFor(testContext, testData).should.equal('/author/joe-bloggs/');
-            urlService.utils.urlFor(testContext, testData, true).should.equal('http://my-ghost-blog.com/author/joe-bloggs/');
-
-            configUtils.set({url: 'http://my-ghost-blog.com/blog'});
-            urlService.utils.urlFor(testContext, testData).should.equal('/blog/author/joe-bloggs/');
-            urlService.utils.urlFor(testContext, testData, true).should.equal('http://my-ghost-blog.com/blog/author/joe-bloggs/');
-        });
-
         it('should return url for an image when asked for', function () {
             var testContext = 'image',
                 testData;
@@ -549,10 +490,8 @@ describe('Url', function () {
         });
     });
 
-    describe('urlPathForPost', function () {
-        var localSettingsCache = {
-            permalinks: '/:slug/'
-        };
+    describe('replacePermalink', function () {
+        const localSettingsCache = {};
 
         beforeEach(function () {
             sandbox.stub(settingsCache, 'get').callsFake(function (key) {
@@ -564,100 +503,81 @@ describe('Url', function () {
             var testData = testUtils.DataGenerator.Content.posts[2],
                 postLink = '/short-and-sweet/';
 
-            urlService.utils.urlPathForPost(testData).should.equal(postLink);
+            urlService.utils.replacePermalink('/:slug/', testData).should.equal(postLink);
         });
 
-        it('permalink is /:year/:month/:day/:slug, blog timezone is Los Angeles', function () {
+        it('permalink is /:year/:month/:day/:slug/, blog timezone is Los Angeles', function () {
             localSettingsCache.active_timezone = 'America/Los_Angeles';
-            localSettingsCache.permalinks = '/:year/:month/:day/:slug/';
 
             var testData = testUtils.DataGenerator.Content.posts[2],
                 postLink = '/2016/05/17/short-and-sweet/';
 
             testData.published_at = new Date('2016-05-18T06:30:00.000Z');
-            urlService.utils.urlPathForPost(testData).should.equal(postLink);
+            urlService.utils.replacePermalink('/:year/:month/:day/:slug/', testData).should.equal(postLink);
         });
 
-        it('permalink is /:year/:month/:day/:slug, blog timezone is Asia Tokyo', function () {
+        it('permalink is /:year/:month/:day/:slug/, blog timezone is Asia Tokyo', function () {
             localSettingsCache.active_timezone = 'Asia/Tokyo';
-            localSettingsCache.permalinks = '/:year/:month/:day/:slug/';
 
             var testData = testUtils.DataGenerator.Content.posts[2],
                 postLink = '/2016/05/18/short-and-sweet/';
 
             testData.published_at = new Date('2016-05-18T06:30:00.000Z');
-            urlService.utils.urlPathForPost(testData).should.equal(postLink);
+            urlService.utils.replacePermalink('/:year/:month/:day/:slug/', testData).should.equal(postLink);
         });
 
-        it('post is page, no permalink usage allowed at all', function () {
+        it('permalink is /:year/:id/:author/, TZ is LA', function () {
             localSettingsCache.active_timezone = 'America/Los_Angeles';
-            localSettingsCache.permalinks = '/:year/:month/:day/:slug/';
 
-            var testData = testUtils.DataGenerator.Content.posts[5],
-                postLink = '/static-page-test/';
-
-            urlService.utils.urlPathForPost(testData).should.equal(postLink);
-        });
-
-        it('permalink is /:year/:id:/:author', function () {
-            localSettingsCache.active_timezone = 'America/Los_Angeles';
-            localSettingsCache.permalinks = '/:year/:id/:author/';
-
-            var testData = _.merge({}, testUtils.DataGenerator.Content.posts[2], {id: 3}, {author: {slug: 'joe-blog'}}),
+            var testData = _.merge({}, testUtils.DataGenerator.Content.posts[2], {id: 3}, {primary_author: {slug: 'joe-blog'}}),
                 postLink = '/2015/3/joe-blog/';
 
             testData.published_at = new Date('2016-01-01T00:00:00.000Z');
-            urlService.utils.urlPathForPost(testData).should.equal(postLink);
+            urlService.utils.replacePermalink('/:year/:id/:author/', testData).should.equal(postLink);
         });
 
-        it('permalink is /:year/:id:/:author', function () {
+        it('permalink is /:year/:id:/:author/, TZ is Berlin', function () {
             localSettingsCache.active_timezone = 'Europe/Berlin';
-            localSettingsCache.permalinks = '/:year/:id/:author/';
 
-            var testData = _.merge({}, testUtils.DataGenerator.Content.posts[2], {id: 3}, {author: {slug: 'joe-blog'}}),
+            var testData = _.merge({}, testUtils.DataGenerator.Content.posts[2], {id: 3}, {primary_author: {slug: 'joe-blog'}}),
                 postLink = '/2016/3/joe-blog/';
 
             testData.published_at = new Date('2016-01-01T00:00:00.000Z');
-            urlService.utils.urlPathForPost(testData).should.equal(postLink);
+            urlService.utils.replacePermalink('/:year/:id/:author/', testData).should.equal(postLink);
         });
 
         it('permalink is /:primary_tag/:slug/ and there is a primary_tag', function () {
             localSettingsCache.active_timezone = 'Europe/Berlin';
-            localSettingsCache.permalinks = '/:primary_tag/:slug/';
 
             var testData = _.merge({}, testUtils.DataGenerator.Content.posts[2], {primary_tag: {slug: 'bitcoin'}}),
                 postLink = '/bitcoin/short-and-sweet/';
 
             testData.published_at = new Date('2016-01-01T00:00:00.000Z');
-            urlService.utils.urlPathForPost(testData).should.equal(postLink);
+            urlService.utils.replacePermalink('/:primary_tag/:slug/', testData).should.equal(postLink);
         });
 
         it('permalink is /:primary_tag/:slug/ and there is NO primary_tag', function () {
             localSettingsCache.active_timezone = 'Europe/Berlin';
-            localSettingsCache.permalinks = '/:primary_tag/:slug/';
 
             var testData = testUtils.DataGenerator.Content.posts[2],
                 postLink = '/all/short-and-sweet/';
 
             testData.published_at = new Date('2016-01-01T00:00:00.000Z');
-            urlService.utils.urlPathForPost(testData).should.equal(postLink);
+            urlService.utils.replacePermalink('/:primary_tag/:slug/', testData).should.equal(postLink);
         });
 
         it('shows "undefined" for unknown route segments', function () {
             localSettingsCache.active_timezone = 'Europe/Berlin';
-            localSettingsCache.permalinks = '/:tag/:slug/';
 
             var testData = testUtils.DataGenerator.Content.posts[2],
-                // @TODO: is this the correct behaviour?
                 postLink = '/undefined/short-and-sweet/';
 
             testData.published_at = new Date('2016-01-01T00:00:00.000Z');
-            urlService.utils.urlPathForPost(testData).should.equal(postLink);
+            urlService.utils.replacePermalink('/:tag/:slug/', testData).should.equal(postLink);
         });
 
         it('post is not published yet', function () {
             localSettingsCache.active_timezone = 'Europe/London';
-            localSettingsCache.permalinks = '/:year/:month/:day/:slug/';
 
             var testData = _.merge(testUtils.DataGenerator.Content.posts[2], {id: 3, published_at: null}),
                 nowMoment = moment().tz('Europe/London'),
@@ -667,7 +587,7 @@ describe('Url', function () {
             postLink = postLink.replace('MM', nowMoment.format('MM'));
             postLink = postLink.replace('DD', nowMoment.format('DD'));
 
-            urlService.utils.urlPathForPost(testData).should.equal(postLink);
+            urlService.utils.replacePermalink('/:year/:month/:day/:slug/', testData).should.equal(postLink);
         });
     });
 
diff --git a/core/test/utils/channelUtils.js b/core/test/utils/channelUtils.js
deleted file mode 100644
index 90d4e2ad99..0000000000
--- a/core/test/utils/channelUtils.js
+++ /dev/null
@@ -1,165 +0,0 @@
-var _ = require('lodash'),
-    should = require('should'),
-    defaultChannels = require('../../server/services/channels/config.channels.json'),
-    Channel = require('../../server/services/channels/Channel');
-
-// This is a function to get a fake or test channel
-// It's currently based on the default config in Ghost itself
-module.exports.getTestChannel = function getTestChannel(channelName) {
-    return new Channel(channelName, defaultChannels[channelName]);
-};
-
-module.exports.getDefaultChannels = function getDefaultChannels() {
-    return defaultChannels;
-};
-
-// Little shortcut
-module.exports.Channel = Channel;
-
-// Custom Channel-Related assertions
-should.Assertion.add('Channel', function (options) {
-    options = options || {};
-
-    this.params = {operator: 'to be a valid Channel'};
-    this.obj.should.be.an.Object();
-    this.obj.should.be.an.instanceof(Channel);
-
-    this.obj.should.have.properties('name', 'route', 'context', 'postOptions', 'isPaged', 'hasRSS', '_origOptions');
-
-    this.obj.name.should.be.a.String();
-    this.obj.route.should.be.a.String();
-    this.obj.context.should.be.an.Array();
-    this.obj.context.length.should.be.aboveOrEqual(1);
-    this.obj.postOptions.should.be.an.Object();
-    this.obj.isPaged.should.be.a.Boolean();
-    this.obj.hasRSS.should.be.a.Boolean();
-});
-
-/**
- * Assertions on the express API
- */
-should.Assertion.add('Stack', function (length) {
-    this.params = {
-        operator: 'to be a valid Express Stack',
-        actual: _.map(this.obj, 'name')
-    };
-
-    this.obj.should.be.an.Array();
-    if (length) {
-        this.obj.length.should.eql(length);
-    }
-});
-
-should.Assertion.add('ExpressRouter', function (options) {
-    options = options || {};
-
-    this.params = {
-        operator: 'to be a valid Express Router',
-        actual: require('util').inspect(this.obj, {depth: 1})
-    };
-
-    this.obj.should.be.a.Function();
-    this.obj.name.should.eql('router');
-    this.obj.should.have.property('mergeParams', true);
-    this.obj.should.have.property('strict', undefined);
-    this.obj.should.have.property('stack');
-
-    if (options.params) {
-        // Verify the params function!
-        this.obj.params.should.have.property(options.params.key);
-        this.obj.params[options.params.key][0].name.should.eql(options.params.value);
-    }
-
-    this.obj.stack.should.be.a.Stack(options.stackLength);
-});
-
-should.Assertion.add('Layer', function () {
-    this.params = {operator: 'to be a valid Express Layer'};
-
-    this.obj.should.be.an.Object().with.properties(['handle', 'name', 'params', 'path', 'keys', 'regexp', 'route']);
-});
-
-should.Assertion.add('RouterLayer', function (options) {
-    options = options || {};
-
-    this.params = {operator: 'to be a valid Express Layer, with Router as handle'};
-
-    this.obj.should.be.a.Layer();
-    this.obj.name.should.eql('router');
-    this.obj.handle.should.be.an.ExpressRouter(options);
-
-    if (options.regexp) {
-        this.obj.regexp.toString().should.match(options.regexp);
-    }
-});
-
-should.Assertion.add('DispatchLayer', function (options) {
-    options = options || {};
-
-    this.params = {operator: 'to be a valid Express Layer, with Dispatch as handle'};
-    this.obj.should.be.a.Layer();
-    this.obj.name.should.eql('bound dispatch');
-
-    if (options.regexp) {
-        this.obj.regexp.toString().should.match(options.regexp);
-    }
-
-    if (options.keys) {
-        this.obj.keys.should.be.an.Array().with.lengthOf(options.keys.length);
-        _.map(this.obj.keys, 'name').should.eql(options.keys);
-    } else {
-        this.obj.keys.should.be.an.Array().with.lengthOf(0);
-    }
-
-    this.obj.route.should.be.an.Object().with.properties(['path', 'stack', 'methods']);
-    if (options.route && options.route.path) {
-        this.obj.route.path.should.eql(options.route.path);
-    }
-
-    if (options.route.stack) {
-        this.obj.route.stack.should.be.an.Array().with.lengthOf(options.route.stack.length);
-        _.map(this.obj.route.stack, 'name').should.eql(options.route.stack);
-    } else {
-        this.obj.route.stack.should.be.an.Array();
-    }
-});
-
-should.Assertion.add('RSSRouter', function () {
-    this.params = {operator: 'to be a valid RSS Router'};
-
-    this.obj.should.be.a.RouterLayer({
-        stackLength: 3,
-        params: {
-            key: 'page',
-            value: 'handlePageParam'
-        }
-    });
-
-    var routeStack = this.obj.handle.stack;
-
-    // Layer 1 should be the handler for /rss/
-    routeStack[0].should.be.a.DispatchLayer({
-        route: {
-            path: '/rss/',
-            stack: ['doChannelConfig', 'rssConfigMiddleware', 'generate']
-        }
-    });
-
-    // Layer 2 should be the handler for pagination
-    routeStack[1].should.be.a.DispatchLayer({
-        keys: ['page'],
-        route: {
-            path: '/rss/:page(\\d+)/',
-            stack: ['doChannelConfig', 'rssConfigMiddleware', 'generate']
-        }
-    });
-
-    // // Layer 3 should be a handler for the extra /feed/ url
-    routeStack[2].should.be.a.DispatchLayer({
-        route: {
-            path: '/feed/',
-            stack: ['redirectToRSS']
-        }
-    });
-});
-
diff --git a/core/test/utils/fixtures/data-generator.js b/core/test/utils/fixtures/data-generator.js
index 1021e0e4ee..78ca83ee7b 100644
--- a/core/test/utils/fixtures/data-generator.js
+++ b/core/test/utils/fixtures/data-generator.js
@@ -402,6 +402,9 @@ DataGenerator.forKnex = (function () {
 
         return _.defaults(newObj, {
             id: ObjectId.generate(),
+            name: 'tag',
+            slug: 'slug',
+            description: 'description',
             visibility: 'public',
             created_by: DataGenerator.Content.users[0].id,
             created_at: new Date(),
@@ -433,6 +436,7 @@ DataGenerator.forKnex = (function () {
             feature_image: null,
             featured: false,
             page: false,
+            slug: 'slug',
             author_id: DataGenerator.Content.users[0].id,
             updated_at: new Date(),
             updated_by: DataGenerator.Content.users[0].id,
@@ -468,14 +472,19 @@ DataGenerator.forKnex = (function () {
         return _.defaults(newObj, {
             id: ObjectId.generate(),
             name: 'name',
+            email: 'test@ghost.org',
+            bio: 'bio',
+            website: null,
             slug: 'slug_' + Date.now(),
+            profile_image: null,
             status: 'active',
             password: 'Sl1m3rson99',
             created_by: DataGenerator.Content.users[0].id,
             created_at: new Date(),
             updated_at: new Date(),
             updated_by: DataGenerator.Content.users[0].id,
-            visibility: 'public'
+            visibility: 'public',
+            location: 'location'
         });
     }
 
diff --git a/core/test/utils/fixtures/settings/badroutes.yaml b/core/test/utils/fixtures/settings/badroutes.yaml
index 9af1e0d882..76b549099d 100644
--- a/core/test/utils/fixtures/settings/badroutes.yaml
+++ b/core/test/utils/fixtures/settings/badroutes.yaml
@@ -2,7 +2,7 @@ routes:
 
 collections:
   /
-    route: '{globals.permalinks}'
+    permalink: '{globals.permalinks}'
     template:
       - home
       - index
diff --git a/core/test/utils/fixtures/settings/goodroutes.yaml b/core/test/utils/fixtures/settings/goodroutes.yaml
index 7979e89ba0..b11f52a613 100644
--- a/core/test/utils/fixtures/settings/goodroutes.yaml
+++ b/core/test/utils/fixtures/settings/goodroutes.yaml
@@ -2,7 +2,7 @@ routes:
 
 collections:
   /:
-    route: '{globals.permalinks}'
+    permalink: '{globals.permalinks}'
     template:
       - home
       - index
diff --git a/core/test/utils/fixtures/settings/routes.yaml b/core/test/utils/fixtures/settings/routes.yaml
new file mode 100644
index 0000000000..b11f52a613
--- /dev/null
+++ b/core/test/utils/fixtures/settings/routes.yaml
@@ -0,0 +1,12 @@
+routes:
+
+collections:
+  /:
+    permalink: '{globals.permalinks}'
+    template:
+      - home
+      - index
+
+taxonomies:
+  tag: /tag/{slug}/
+  author: /author/{slug}/
diff --git a/core/test/utils/fixtures/themes/test-theme/default.hbs b/core/test/utils/fixtures/themes/test-theme/default.hbs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/core/test/utils/fixtures/themes/test-theme/home.hbs b/core/test/utils/fixtures/themes/test-theme/home.hbs
new file mode 100644
index 0000000000..e92d84ba66
--- /dev/null
+++ b/core/test/utils/fixtures/themes/test-theme/home.hbs
@@ -0,0 +1 @@
+home.hbs
\ No newline at end of file
diff --git a/core/test/utils/fixtures/themes/test-theme/something.hbs b/core/test/utils/fixtures/themes/test-theme/something.hbs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/core/test/utils/index.js b/core/test/utils/index.js
index b2cd59ac5a..0766b2a71f 100644
--- a/core/test/utils/index.js
+++ b/core/test/utils/index.js
@@ -10,6 +10,7 @@ var Promise = require('bluebird'),
     uuid = require('uuid'),
     KnexMigrator = require('knex-migrator'),
     ghost = require('../../server'),
+    api = require('../../server/api'),
     common = require('../../server/lib/common'),
     fixtureUtils = require('../../server/data/schema/fixtures/utils'),
     db = require('../../server/data/db'),
@@ -17,8 +18,10 @@ var Promise = require('bluebird'),
     schemaTables = Object.keys(schema),
     models = require('../../server/models'),
     urlService = require('../../server/services/url'),
-    SettingsLib = require('../../server/services/settings'),
-    SettingsCache = require('../../server/services/settings/cache'),
+    routingService = require('../../server/services/routing'),
+    settingsService = require('../../server/services/settings'),
+    settingsCache = require('../../server/services/settings/cache'),
+    imageLib = require('../../server/lib/image'),
     customRedirectsMiddleware = require('../../server/web/middleware/custom-redirects'),
     permissions = require('../../server/services/permissions'),
     sequence = require('../../server/lib/promise/sequence'),
@@ -26,7 +29,7 @@ var Promise = require('bluebird'),
     DataGenerator = require('./fixtures/data-generator'),
     configUtils = require('./configUtils'),
     filterData = require('./fixtures/filter-param'),
-    API = require('./api'),
+    APIAssertions = require('./api'),
     mocks = require('./mocks'),
     config = require('../../server/config'),
     knexMigrator = new KnexMigrator(),
@@ -482,7 +485,24 @@ fixtures = {
 
 /** Test Utility Functions **/
 initData = function initData() {
-    return knexMigrator.init();
+    return knexMigrator.init()
+        .then(function () {
+            common.events.emit('db.ready');
+
+            let timeout;
+
+            return new Promise(function (resolve) {
+                (function retry() {
+                    clearTimeout(timeout);
+
+                    if (urlService.hasFinished()) {
+                        return resolve();
+                    }
+
+                    timeout = setTimeout(retry, 50);
+                })();
+            });
+        });
 };
 
 clearBruteData = function clearBruteData() {
@@ -506,7 +526,10 @@ truncate = function truncate(tableName) {
 // we must always try to delete all tables
 clearData = function clearData() {
     debug('Database reset');
-    return knexMigrator.reset({force: true});
+    return knexMigrator.reset({force: true})
+        .then(function () {
+            urlService.softReset();
+        });
 };
 
 toDoList = {
@@ -556,8 +579,8 @@ toDoList = {
         return fixtures.insertApps();
     },
     settings: function populateSettings() {
-        SettingsCache.shutdown();
-        return SettingsLib.init();
+        settingsCache.shutdown();
+        return settingsService.init();
     },
     'users:roles': function createUsersWithRoles() {
         return fixtures.createUsersWithRoles();
@@ -813,6 +836,8 @@ togglePermalinks = function togglePermalinks(request, toggle) {
  */
 teardown = function teardown() {
     debug('Database teardown');
+    urlService.softReset();
+
     var tables = schemaTables.concat(['migrations']);
 
     if (config.get('database:client') === 'sqlite3') {
@@ -884,6 +909,7 @@ startGhost = function startGhost(options) {
         redirectsFile: true,
         forceStart: false,
         copyThemes: true,
+        copySettings: true,
         contentFolder: path.join(os.tmpdir(), uuid.v1(), 'ghost-test'),
         subdir: false
     }, options);
@@ -903,6 +929,7 @@ startGhost = function startGhost(options) {
     fs.ensureDirSync(path.join(contentFolderForTests, 'images'));
     fs.ensureDirSync(path.join(contentFolderForTests, 'logs'));
     fs.ensureDirSync(path.join(contentFolderForTests, 'adapters'));
+    fs.ensureDirSync(path.join(contentFolderForTests, 'settings'));
 
     if (options.copyThemes) {
         // Copy all themes into the new test content folder. Default active theme is always casper. If you want to use a different theme, you have to set the active theme (e.g. stub)
@@ -913,6 +940,10 @@ startGhost = function startGhost(options) {
         fs.copySync(path.join(__dirname, 'fixtures', 'data', 'redirects.json'), path.join(contentFolderForTests, 'data', 'redirects.json'));
     }
 
+    if (options.copySettings) {
+        fs.copySync(path.join(__dirname, 'fixtures', 'settings', 'routes.yaml'), path.join(contentFolderForTests, 'settings', 'routes.yaml'));
+    }
+
     // truncate database and re-run fixtures
     // we have to ensure that some components in Ghost are reloaded
     if (ghostServer && ghostServer.httpServer && !options.forceStart) {
@@ -921,12 +952,30 @@ startGhost = function startGhost(options) {
                 return knexMigrator.init({only: 2});
             })
             .then(function () {
-                SettingsCache.shutdown();
-                return SettingsLib.init();
+                settingsCache.shutdown();
+                return settingsService.init();
             })
             .then(function () {
                 return themes.init();
             })
+            .then(function () {
+                urlService.softReset();
+                common.events.emit('db.ready');
+
+                let timeout;
+
+                return new Promise(function (resolve) {
+                    (function retry() {
+                        clearTimeout(timeout);
+
+                        if (urlService.hasFinished()) {
+                            return resolve();
+                        }
+
+                        timeout = setTimeout(retry, 50);
+                    })();
+                });
+            })
             .then(function () {
                 customRedirectsMiddleware.reload();
 
@@ -945,6 +994,8 @@ startGhost = function startGhost(options) {
             return knexMigrator.init();
         })
         .then(function initializeGhost() {
+            urlService.resetGenerators();
+
             return ghost();
         })
         .then(function startGhost(_ghostServer) {
@@ -958,33 +1009,106 @@ startGhost = function startGhost(options) {
 
             return ghostServer.start();
         })
+        .then(function () {
+            let timeout;
+
+            return new Promise(function (resolve) {
+                (function retry() {
+                    clearTimeout(timeout);
+
+                    if (urlService.hasFinished()) {
+                        return resolve();
+                    }
+
+                    timeout = setTimeout(retry, 50);
+                })();
+            });
+        })
         .then(function returnGhost() {
             return ghostServer;
         });
 };
 
-/**
- * Minimal configuration to start integration/unit tests.
- */
-configureGhost = function configureGhost(sandbox) {
-    models.init();
-
-    const cacheStub = sandbox.stub(SettingsCache, 'get');
-
-    cacheStub.withArgs('active_theme').returns('casper');
-    cacheStub.withArgs('active_timezone').returns('Etc/UTC');
-    cacheStub.withArgs('permalinks').returns('/:slug/');
-
-    configUtils.set('paths:contentPath', path.join(__dirname, 'fixtures'));
-
-    configUtils.set('times:getImageSizeTimeoutInMS', 1);
-
-    return themes.init();
-};
-
 module.exports = {
     startGhost: startGhost,
-    configureGhost: configureGhost,
+    integrationTesting: {
+        overrideGhostConfig: function overrideGhostConfig(configUtils) {
+            configUtils.set('paths:contentPath', path.join(__dirname, 'fixtures'));
+            configUtils.set('times:getImageSizeTimeoutInMS', 1);
+        },
+
+        defaultMocks: function defaultMocks(sandbox, options) {
+            options = options || {};
+
+            configUtils.set('paths:contentPath', path.join(__dirname, 'fixtures'));
+
+            const cacheStub = sandbox.stub(settingsCache, 'get');
+
+            cacheStub.withArgs('active_theme').returns(options.theme || 'casper');
+            cacheStub.withArgs('active_timezone').returns('Etc/UTC');
+            cacheStub.withArgs('permalinks').returns('/:slug/');
+            cacheStub.withArgs('labs').returns({publicAPI: true});
+
+            sandbox.stub(api.clients, 'read').returns(Promise.resolve({
+                clients: [
+                    {slug: 'ghost-frontend', secret: 'a1bcde23cfe5', status: 'enabled'}
+                ]
+            }));
+
+            sandbox.stub(imageLib.imageSize, 'getImageSizeFromUrl').resolves();
+        },
+
+        initGhost: function () {
+            models.init();
+            return themes.init();
+        },
+
+        routing: {
+            reset: function () {
+                routingService.registry.resetAll();
+            }
+        },
+
+        urlService: {
+            waitTillFinished: function () {
+                let timeout;
+
+                common.events.emit('db.ready');
+
+                return new Promise(function (resolve) {
+                    (function retry() {
+                        clearTimeout(timeout);
+
+                        if (urlService.hasFinished()) {
+                            return resolve();
+                        }
+
+                        timeout = setTimeout(retry, 50);
+                    })();
+                });
+            },
+
+            init: function () {
+                const routes = settingsService.get('routes');
+
+                const collectionRouter = new routingService.CollectionRouter('/', routes.collections['/']);
+                const tagRouter = new routingService.TaxonomyRouter('tag', routes.taxonomies.tag);
+                const authorRouter = new routingService.TaxonomyRouter('author', routes.taxonomies.author);
+
+                common.events.emit('db.ready');
+
+                return this.waitTillFinished();
+            },
+
+            reset: function () {
+                urlService.softReset();
+            },
+
+            resetGenerators: function () {
+                urlService.resetGenerators();
+            }
+        },
+    },
     teardown: teardown,
     truncate: truncate,
     setup: setup,
@@ -1035,7 +1159,7 @@ module.exports = {
 
     DataGenerator: DataGenerator,
     filterData: filterData,
-    API: API,
+    API: APIAssertions,
 
     // Helpers to make it easier to write tests which are easy to read
     context: {
diff --git a/core/test/utils/mocks/express.js b/core/test/utils/mocks/express.js
index decf6277de..ba6f9bf1e7 100644
--- a/core/test/utils/mocks/express.js
+++ b/core/test/utils/mocks/express.js
@@ -32,18 +32,30 @@ module.exports = {
         };
 
         return new Promise(function (resolve) {
-            const onFinish = (() => {
+            res.end = function (body) {
                 resolve({
                     err: res.req.err,
+                    body: body,
                     statusCode: res.statusCode,
                     headers: res._headers,
                     template: res._template,
                     req: req,
                     res: res
                 });
-            });
+            };
+
+            res.send = function (body) {
+                resolve({
+                    err: res.req.err,
+                    body: body,
+                    statusCode: res.statusCode,
+                    headers: res._headers,
+                    template: res._template,
+                    req: req,
+                    res: res
+                });
+            };
 
-            res.once('finish', onFinish);
             app(req, res);
         });
     }
diff --git a/core/test/utils/mocks/knex.js b/core/test/utils/mocks/knex.js
index 83f5a22b1d..8a2e0052cf 100644
--- a/core/test/utils/mocks/knex.js
+++ b/core/test/utils/mocks/knex.js
@@ -7,10 +7,10 @@ const mockKnex = require('mock-knex'),
     knex = require('../../../server/data/db').knex;
 
 /**
- * Knex mock. The database is our Datagenerator.
+ * Knex mock. The database values are taken from our Datagenerator.
  * You can either self register queries or you simply rely on the data generator data.
  *
- * Please extend if you use-case does not work.
+ * Please extend if your use-case does not work.
  *
  * @TODO: sqlite3 :memory: mode wasn't working for me
  */
@@ -103,7 +103,7 @@ class KnexMock {
 
                             if (targetEntries && targetEntries.length) {
                                 _.each(targetEntries, ((target) => {
-                                    const found = _.cloneDeep(_.find(this.db[joinTable], ((joinEntry) => {
+                                    let found = _.cloneDeep(_.find(this.db[joinTable], ((joinEntry) => {
                                         if (joinEntry[joinAttribute] === target[targetAttribute]) {
                                             return true;
                                         }
@@ -112,7 +112,7 @@ class KnexMock {
                                     _.each(target, function (value, key) {
                                         let match = query.sql.match(new RegExp('\\"' + targetTable + '\\"\\.\\"' + key + '"\\sas\\s(\\"\\w+\\")'));
 
-                                        // CASE: e.g. id
+                                        // CASE: "posts_tags"."post_id" as "post_id"
                                         if (match) {
                                             match = match[1];
                                             match = match.replace(/"/g, '');
@@ -120,6 +120,16 @@ class KnexMock {
                                         }
                                     });
 
+                                    let keys = query.sql.match(/select\s(\".*\"\,?)+\sfrom/)[1];
+
+                                    if (!keys.match(/\.*/)) {
+                                        _.each(found, (value, key)=> {
+                                            if (keys.indexOf(key) === -1) {
+                                                delete found[key];
+                                            }
+                                        });
+                                    }
+
                                     if (found) {
                                         toReturn.push(found);
                                     }
@@ -144,24 +154,14 @@ class KnexMock {
                             if (!where) {
                                 where = query.sql.match(/\"\w+\"\.\"(\w+)\"\sin\s\(\?\)/)[1];
                             } else {
-                                // 3 wheres
-                                let wheresMatch = query.sql.match(/\"(\w+)\"\s\=\s\?\sand\s\"\w+\"\.\"(\w+)\"\s\=\s\?\sand\s\"\w+\"\.\"(\w+)\"\s\=\s\?/);
+                                let wheresMatch = query.sql.match(/\(?\"(\w+)\"\.?\"?(\w+)?\"?\s=\s\?\)?/g);
 
-                                if (wheresMatch) {
-                                    wheres.push(wheresMatch[1]);
-                                    wheres.push(wheresMatch[2]);
-                                    wheres.push(wheresMatch[3]);
-                                } else {
-                                    // 2 wheres
-                                    let wheresMatch = query.sql.match(/\"(\w+)\"\s\=\s\?\sand\s\"\w+\"\.\"(\w+)\"\s\=\s\?/);
-
-                                    if (wheresMatch) {
-                                        wheres.push(wheresMatch[1]);
-                                        wheres.push(wheresMatch[2]);
-                                    } else {
-                                        wheres.push(where[1]);
-                                    }
-                                }
+                                // e.g. [ '("posts"."status" = ?)', '("posts"."page" = ?)' ]
+                                // e.g. [ '"status" = ?' ]
+                                _.each(wheresMatch, (result)=> {
+                                    let attr = result.match(/\(?\"(\w+)\"\.?\"?(\w+)?\"?\s=\s\?\)?/);
+                                    wheres.push(attr[2] || attr[1]);
+                                });
                             }
 
                             values = query.bindings.slice(0, wheres.length);
@@ -190,6 +190,30 @@ class KnexMock {
                                     return obj;
                                 });
 
+                                if (query.sql.match(/count\(/)) {
+                                    const as = query.sql.match(/count\(.*\)\sas\s(\w+)/)[1];
+                                    return query.response([{[as]: dbEntry.length}]);
+                                }
+
+                                if (query.sql.match(/limit\s\?\soffset\s\?/)) {
+                                    const limit = query.bindings[query.bindings.length - 2];
+                                    const offset = query.bindings[query.bindings.length - 1];
+
+                                    function separateIt(arr, size) {
+                                        const newArr = [];
+                                        for (let i = 0; i < arr.length; i += size) {
+                                            let sliceIt = arr.slice(i, i + size);
+                                            newArr.push(sliceIt);
+                                        }
+                                        return newArr;
+                                    }
+
+                                    dbEntry = separateIt(dbEntry, limit)[offset - 1];
+                                } else if (query.sql.match(/limit\s\?$/)) {
+                                    const limit = query.bindings[query.bindings.length - 1];
+                                    dbEntry = dbEntry.splice(0, limit);
+                                }
+
                                 query.response(dbEntry);
                                 debug('#### Query end.\n');
                             } else {