Fix mock data for what actually comes out of the API, and fix code to still work