Added unit tests
* Removed unnecessary OpenmrsMatchers class