fixing life cycle test failures