had to remove ScalaMock because it was incompatible with scalacheck

Bill is sorting this out, ScalaMock seems to be abandoned though.
fixing mockito's scope
sorting out a few project things, refactoring the tests, fixing pmip