can we have the rest api parser change + test as a separate commit? You can push it straight-away I'd say, looks good!