HTML-523 Fixed tests for OpenMRS 1.8, 1.9 and 1.10