Fix extra instructor options in preview
Fix and adjust tests
[2379] 'preview as instructor' showing extra options