Almost but one scheduler test now passing, 89% overall passing.