Updated mock scheduler to be both transaction safe and immediate