Tweaks to the aliveness tests