Added new test route. Move preset routes into factory function on Router.
Removed swp file