Merge "Adds test for router rescheduling"