Route rework and tests

Rebuilds the routes and adds controller action testing