Fix test cases for collapsed schedules, and fix cases with no programs