Change to option test script so that the underlying and option type can be specified on the command line