Make some modifications so these can be easier to use with the TestablePriorityScheduler