Add more lifecycle tests