Scheduler work.
Schedule test fixes.