Misc: Upgraded ScalaTest to 2.2.1 and minor refactoring