Improved Router Tests