Corrected tests and increased expectations
Reduced scalacheck tests to prevent travis to hang