Added Junit tests
Merge pull request #37 from openmrs/merger

Added Junit tests