When we merge the code with that of https://tickets.openmrs.org/browse/TRUNK-3887, we might want to use the test handler added in that test class