Support optional route constraints in MVC

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

using pre-baked query strings here makes this really hard to read. This needs some comments.