Lots of router test improvements