Fix test cases for runtime transition

Two commits here that fix test case dependencies on the old scheduler.