Additional changes in Delayed calls

 * Run scheduler in engine
 * Added cleanUp in scheduler tests

Change-Id: I1a24535b6a2903d69cb533acbdbea92092bb8acc
Merge "Additional changes in Delayed calls"