Use timeout option in mach.serve instead of mach.gracePeriod