Some values in options file were still being overwritten by defaults.

Added a couple of tests to check for this.