Adding Mockito to the project, and fixing two of the unit tests so that
they’ll compile.