Improve lifecycle test