Fix test suite and some paths that included Scala versions