added junit and resolved minor bugs
Merge pull request #34 from openmrs/merger

added junit and resolved minor bugs