Fixing Scala unit tests after previous commits accidentally broke them
Merge pull request #347 from benjchristensen/scala-unit-tests

Fixing Scala unit tests after previous commits accidentally broke them