Adds tests and makes sure all DataItem types collapse correctly

Bug: 16517558
Change-Id: Ib819864dce11818861d455efbf2b9059d91f622c
6 files changed