Update to JSON structure. The historical page still requires an update.
Fix unit tests for new json structure
Merge remote-tracking branch 'origin' into order-history