Improvements to ItemDiffTest

Change-Id: Ied6f3a62616cf786dc0b9eadb35e5b35f2214c80