Merge "Increase unit test coverage in SnapshotManager"