improved(?) router tests