Fix lists, add router tests