Factorize now that we use Scalatest