Merge "Improve test coverage of rollback data persistence."