Scalatest 2.2.0 + updated module

This should get the scalatest module into a state suitable for use in place of the specs2 module.