Add rest of routes and functional tests for those routes