Fix the tests, better scheduling