Add more Router tests for expanded `req` object and _dispatch() refactor