Make current tests work with new schedule format
Update for format changes