Better route manager as well as tests

Signed-off-by: Euan Torano <euantorano@gmail.com>