Scheduler tests update

See commits