Bring in scalaform; convert tests to property based where easy.