Updated tests to use Mockito. Updated versions in pom.xml