Using scalatest for basic testing. Specs2 is still used for mocks.
Merge remote-tracking branch 'origin/master'
One more test to migrate