Updated TestDataCollection structure.
Updated unit tests.