Fix tidy scenarios in lifecycle tests