upgrade to scalatest 2.2.1

keeping it [fresh](http://www.scalatest.org/release_notes/2.2.1)