Upgraded scalatest & brought in scalacheck to allow generating test data