Update controller tests and add router tests