Fixing Scala unit tests after previous commits accidentally broke them