upgrade scalatest to 2.0-RC1
refactor aggregate