Still fixing tests... mockito issues