Cleaned up life and death function test