Added scalacheck and an example test, refactored previous tests