Adding a mockito matcher for deep comparison of objects; refactored few tests