Delay now a feature rather than test code