Uncommented and modified Scheduler tests.