Merge "Add unit tests to verify EDITED preservation"