CC-5651: Unit Test the Scheduler

Reorganized tests