Reformat options
Fix up tests