Support optional route constraints in MVC

This PR
1. Adds tests for inline constraint
2. Fixes tests broken by Routing change for inline constraints

generally if there's a scrollbar in github, the line's too long and needs to be broken up. In product code we're strict about a 120 char limit, and in tests we're not as strict, but this one needs to be broken up.