Changed data format to remove unnecessary list. Test data reflects new format.

New format to make it easier to parse.