Added NotNullString
Modify ItemTest to match changes to Item.