Another batch of conversion to mockito