Need to redo tests to work with new JSON structure