Modify test to check multiple aspects of scheduling