More unit tests around survivor movement