Reorganise the API reverse tests and extend the checks for the output format, testing for all expected fields.