Getting proper tests in place for scheduler