Updated the data model to match the newest version of the data model. Updated test cases to match.