Now safe includes other hero life
Fixed tests