Improved router test.