Make mockito a test dependency
Merge pull request #3 from bbeck/master

Make mockito a test dependency