Fixing broken scala tests