Added some tests with Mockito and JUnit
Merge remote-tracking branch 'origin/master'