Added tests and custom routes