Added Reschedule to Schedule object + some tests