first pass at mockito upgrade