Update to ScalaTest 2.2.1

This is a bugfix release that required no code changes