Added Scheduler Tests plus changes to make tests run.