More fixing after the merge.

The lifecycle tests, as they exist so far, now pass, so we
should be back to a sensible position for further development.