Fixing up the fixed_time option and test