Add ordered choice of respawns
Add respawns test, refactoring