I commented out the unit test because the API changes is pretty significant. I created a ticket to rewrite the unit tests.
[REPORT-501](https://tickets.openmrs.org/browse/REPORT-501)