Clean up use of MockitoAnnotations.initMocks