Build #12:   Revamp unit tests - Replace EasyMock with Mockito for easier mocking - Bring in Hamc... on branch master almost 11 years ago