fix tests to match new data
don't alias ?uri to ?option; change the var name
Merge branch 'fix-dimension-options'