Fix rollback during update.  More tests.