Fixed router. Added router test.