Fix Options test fail.  (also questionable?)