Add tests, custom routes