Moves to 2.10.x as the default and to scalatest

I'm happy to add it in a different PR, but doesn't feel like it belongs here in the vein of just getting this in and hammer on more tests after?