Merge "use getOldid and getNewid methods in DifferenceEngineTest"