Updated to ScalaTest RC2