Improve schedule tests