Merge "Clean up mockito references"