Junit tests
Merge pull request #38 from openmrs/merger

Few more Junit tests