Added Scheduler and Test Case