Updated scalatest to 2.1.6.

Statring to work through failing test cases.