small mockito fixes