TRUNK-4032 cleared some testcase and openmrs formatting issues