Further additions to router tests