add mockito dependency and some tests
Merge branch 'master' of https://github.com/NorthFury/hackathon
add another test
Merge branch 'master' of https://github.com/NorthFury/hackathon