Adjusted two tests and refractored isDead and alive properties