Clean up scheduler tests

Change-Id: I1541b2324ae36a9f064dca80b5bfa27db7873e4d