Small updates on testScheduler