fix tests failing after scalatest upgrade
Merge pull request #228 from strubell/master

Fix tests failing after scalatest upgrade