Added tests, custom routes