Testing routes
Tidy up Routes