Tests updated to take into account the JSON output option.