Various style fixes; add mockito as dependency
Fix style
Use mockito-core