Schedules: now with updates
Moving tests around