Moves to 2.10.x as the default and to scalatest

I have no idea what this TODO means anymore. :/