Fixed router, made a test, closes #4