Uncomment and fix testAplly in EntityDiff and ItemDiff tests

Change-Id: Ifa71df451cd9f4212ada038dd73568ce4381c9ad
Merge "Uncomment and fix testAplly in EntityDiff and ItemDiff tests"