Merge "Make tests compatible with mockito-extended"