Added tests and custom routes
more tests