Fix and improve the whole Router spec