Make sure that we respect the option order as given in the script

Fix test failing for the option ordering