router test fixes