Merge "Fix Mockito usage." into main