Change to model test script so that any combination of options may be specified