Tidied up describe blocks to reflect new thinking for service.
Continued tidying up application and application tests, splitting out routes.