Merge "Improve test using Mockito.argThat() matcher"