Implement previously failing tests. Add additional tests to ensure only the required data is returned when generating reports.