Improvements to ItemTest

Change-Id: I405b386038b8f28140366485000be66f50b6c85c
Merge "Improvements to ItemTest"