optimized imports into standard Openmrs core format
fixed problem running tests against openmrs 1.8 and 1.9