Issue #197 - unit testing and new dependecy

Pushing some tests as a new branch for evaluation of the new added dependency: Mockito.