updated scalacheck to 1.12.0
added mockito as a test dependency to the junit module
fixed 2 compilation errors
small refactoring