fixup tests, implement reverse ordering for shutdown-type lifecycle events