SBT/plugin upgrades; Scalatest API changes