Scheduling mechanism added; Test added
Timeout improved