Scheduler tests all now passing