Ensure that delay propagates End. Add delay test and test scheduler