Added a unit test that showed the issues with the current implementation
of resolve-changes. Updated it so those issues are now fixed.