scheduler unit test fixes