Shaf: Use cross compatible version of scalatest