Fix tests that broke during text updates
Use criterion and option order num instead of name in HTML attributes
Merge pull request #266 from edx/will/criterion-name-in-dom

Will/criterion name in dom