Retab...
Trying to switch to JSON instead of XML; trying to run the tests
Switching to JSON; updates to make tests work