Update base test data format to include the Report Entry data format