Add testing and fix routes