Moves to 2.10.x as the default and to scalatest

wonder why this is commented out. I don't recall.