Added more to the AutoDelayTest. Committed by aaronistheman.