Standardise use of TestOptions model when dealing with test options