Fixing the route matcher

Can't use matcher.find() after already using matcher.matches()
Updating tests