More tests and correct route parsing