Update run_html support for multiple choice to work with rationale changes
Fix possible NPE, update tests for rationale changes to multiple choice

The NPE might actually be test-related, but it doesn't hurt.