Improved Router tests