Updated Scheduler tests