Added unit tests for #158, cleanup
Updated mockito to 1.9.5, Set DependencyManagement for hamcrest