fixed all test failures to support scheduler interface.