fixup updates during that second phase
also add a little more test coverage to rollback in general