Hamcrest and Mockito deps added, test refactor incomplete.