Make some modifications so these can be easier to use with the TestablePriorityScheduler
Merge branch 'master' into unstable_staging