Merge pull request #33 from Gonthim/master

Refactoring to use Mockito in tests.