Use ScalaCheck, test clean ups.