diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
index 15051b9aaa0f..24b54221c588 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationManager.java
@@ -98,7 +98,7 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
 
   private final ActionManagerEx myActionManagerEx;
 
-  private static final int ourFlagsForTargetElements = TargetElementUtilBase.getInstance().getAllAccepted();
+  private final TargetElementUtilBase myTargetElementUtilBase;
 
   private boolean myCloseOnSneeze;
   
@@ -160,7 +160,7 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
     return ServiceManager.getService(project, DocumentationManager.class);
   }
 
-  public DocumentationManager(final Project project, ActionManagerEx managerEx) {
+  public DocumentationManager(final Project project, ActionManagerEx managerEx, TargetElementUtilBase targetElementUtilBase) {
     super(project);
     myActionManagerEx = managerEx;
     final AnActionListener actionListener = new AnActionListener() {
@@ -199,6 +199,7 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
     };
     myActionManagerEx.addAnActionListener(actionListener, project);
     myUpdateDocAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD,myProject);
+    myTargetElementUtilBase = targetElementUtilBase;
   }
 
   private void closeDocHint() {
@@ -578,11 +579,11 @@ public class DocumentationManager extends DockablePopupManager<DocumentationComp
     }
 
     if (element == null) {
-      element = assertSameProject(util.findTargetElement(editor, ourFlagsForTargetElements, offset));
+      element = assertSameProject(util.findTargetElement(editor, myTargetElementUtilBase.getAllAccepted(), offset));
 
       // Allow context doc over xml tag content
       if (element != null || contextElement != null) {
-        final PsiElement adjusted = assertSameProject(util.adjustElement(editor, ourFlagsForTargetElements, element, contextElement));
+        final PsiElement adjusted = assertSameProject(util.adjustElement(editor, myTargetElementUtilBase.getAllAccepted(), element, contextElement));
         if (adjusted != null) {
           element = adjusted;
         }
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkManager.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkManager.java
index 8ad6f983d656..23ec04e2d49e 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkManager.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,7 +68,11 @@ public class BookmarkManager extends AbstractProjectComponent implements Persist
     return project.getComponent(BookmarkManager.class);
   }
 
-  public BookmarkManager(Project project, MessageBus bus, PsiDocumentManager documentManager, EditorColorsManager colorsManager) {
+  public BookmarkManager(Project project,
+                         MessageBus bus,
+                         PsiDocumentManager documentManager,
+                         EditorColorsManager colorsManager,
+                         EditorFactory editorFactory) {
     super(project);
     colorsManager.addEditorColorsListener(new EditorColorsListener() {
       @Override
@@ -77,7 +81,7 @@ public class BookmarkManager extends AbstractProjectComponent implements Persist
       }
     }, project);
     myBus = bus;
-    EditorEventMulticaster multicaster = EditorFactory.getInstance().getEventMulticaster();
+    EditorEventMulticaster multicaster = editorFactory.getEventMulticaster();
     multicaster.addDocumentListener(new MyDocumentListener(), myProject);
     multicaster.addEditorMouseListener(new MyEditorMouseListener(), myProject);
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerLoader.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerLoader.java
index eafcd9a108ad..c55cd6f1bee4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerLoader.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,11 +40,14 @@ import java.util.Arrays;
  * @author ilyas
  */
 public class GroovyCompilerLoader extends AbstractProjectComponent {
+  static final String GROOVY_STUBS = "groovyStubs";
+  private final CompilerManager myCompilerManager;
+  private final FileEditorManager myFileEditorManager;
 
-  public static final String GROOVY_STUBS = "groovyStubs";
-
-  public GroovyCompilerLoader(Project project) {
+  public GroovyCompilerLoader(Project project, CompilerManager manager, FileEditorManager editorManager) {
     super(project);
+    myCompilerManager = manager;
+    myFileEditorManager = editorManager;
   }
 
   @Nullable
@@ -67,8 +70,7 @@ public class GroovyCompilerLoader extends AbstractProjectComponent {
 
   @Override
   public void projectOpened() {
-    CompilerManager compilerManager = CompilerManager.getInstance(myProject);
-    compilerManager.addCompilableFileType(GroovyFileType.GROOVY_FILE_TYPE);
+    myCompilerManager.addCompilableFileType(GroovyFileType.GROOVY_FILE_TYPE);
 
     myProject.getMessageBus().connect().subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new FileEditorManagerAdapter() {
       @Override
@@ -76,12 +78,10 @@ public class GroovyCompilerLoader extends AbstractProjectComponent {
         if (file.getName().endsWith(".java") && file.getPath().contains(GROOVY_STUBS)) {
           final PsiClass psiClass = findClassByStub(myProject, file);
           if (psiClass != null) {
-            final FileEditorManager fileEditorManager = FileEditorManager.getInstance(myProject);
-            final FileEditor[] editors = fileEditorManager.getEditors(file);
+            final FileEditor[] editors = myFileEditorManager.getEditors(file);
             if (editors.length != 0) {
-              decorateStubFile(file, fileEditorManager, editors[0]);
+              decorateStubFile(file, myFileEditorManager, editors[0]);
             }
-
           }
         }
       }