Added support for scalatest