Add extra testing for alive?