Test fixed
(cherry picked from commit 126642d)
Duplicated scala-library shouldn't affect error highlighting. #SCL-6621 Fixed
(cherry picked from commit c2a21be)