Hi Lars,
You're correct; my work-around would affect all gateway tests. I've thought about the desirability of removing the preview option for multiple-choice tests before and not bothered with it; I'll add it to the list of things to think about as a feature enhancement.
Gavin