diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/IntellijTestDiscoveryProducer.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/IntellijTestDiscoveryProducer.java
index 5a55479260e6..cf54936c457f 100644
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/IntellijTestDiscoveryProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/IntellijTestDiscoveryProducer.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.execution.testDiscovery;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -30,7 +30,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-public class IntellijTestDiscoveryProducer implements TestDiscoveryProducer {
+public final class IntellijTestDiscoveryProducer implements TestDiscoveryProducer {
   private static final String INTELLIJ_TEST_DISCOVERY_HOST = "https://intellij-test-discovery.labs.intellij.net";
 
   private static final NotNullLazyValue<ObjectReader> JSON_READER = NotNullLazyValue.createValue(() -> new ObjectMapper().readerFor(TestsSearchResult.class));
diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/FindUnusedTestDataAction.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/FindUnusedTestDataAction.java
index a20c70b40114..9c63e8b0ee10 100644
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/FindUnusedTestDataAction.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/FindUnusedTestDataAction.java
@@ -34,7 +34,7 @@ import java.util.Set;
 
 import static com.intellij.openapi.vfs.LocalFileSystem.PROTOCOL_PREFIX;
 
-public class FindUnusedTestDataAction extends DumbAwareAction {
+public final class FindUnusedTestDataAction extends DumbAwareAction {
   private final static Logger LOG = Logger.getInstance(FindUnusedTestDataAction.class);
 
   @Override
diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/InterfaceExtensionImplementationClassResolver.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/InterfaceExtensionImplementationClassResolver.java
index 8dc08ffdfa60..28d7be9f7ac8 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/impl/InterfaceExtensionImplementationClassResolver.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/InterfaceExtensionImplementationClassResolver.java
@@ -18,6 +18,7 @@ final class InterfaceExtensionImplementationClassResolver implements Implementat
     "com.intellij.javascript.debugger.execution.DebuggableProgramRunner",
     "com.intellij.spring.model.cacheable.EnableCachingModelProvider",
     "com.intellij.diff.actions.DiffCustomCommandHandler",
+    "com.intellij.execution.testDiscovery.IntellijTestDiscoveryProducer",
     "com.intellij.ide.actions.runAnything.RunAnythingCommandFolding"
   ));
 
diff --git a/platform/lang-api/src/com/intellij/semantic/SemService.java b/platform/lang-api/src/com/intellij/semantic/SemService.java
index c930186da001..7dcc14e1917c 100644
--- a/platform/lang-api/src/com/intellij/semantic/SemService.java
+++ b/platform/lang-api/src/com/intellij/semantic/SemService.java
@@ -1,7 +1,6 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.semantic;
 
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.CachedValuesManager;
@@ -12,20 +11,20 @@ import java.util.List;
 
 /**
  * Provides a way to link some additional data to a psi element.
- * 
- * The API is very close to {@link CachedValuesManager#getCachedValue} but the main difference is that 
+ *
+ * The API is very close to {@link CachedValuesManager#getCachedValue} but the main difference is that
  * a provider isn't passed to the method, but registered separately via {{@link SemContributor}}.
  * Any key can have more than one provider.
- * One more difference with {@link CachedValuesManager} is that a key can be extended by other keys. 
+ * One more difference with {@link CachedValuesManager} is that a key can be extended by other keys.
  * Cached value will be dropped automatically on any change of PSI.
- * 
+ *
  * @author peter
  * @see SemElement
  * @see SemContributor
  */
 public abstract class SemService {
   public static SemService getSemService(@NotNull Project p) {
-    return ServiceManager.getService(p, SemService.class);
+    return p.getService(SemService.class);
   }
 
   @Nullable
diff --git a/plugins/coverage-common/src/com/intellij/coverage/view/SelectInCoverageView.java b/plugins/coverage/src/com/intellij/coverage/view/SelectInCoverageView.java
similarity index 86%
rename from plugins/coverage-common/src/com/intellij/coverage/view/SelectInCoverageView.java
rename to plugins/coverage/src/com/intellij/coverage/view/SelectInCoverageView.java
index f4e4873bb1f3..efa033d11641 100644
--- a/plugins/coverage-common/src/com/intellij/coverage/view/SelectInCoverageView.java
+++ b/plugins/coverage/src/com/intellij/coverage/view/SelectInCoverageView.java
@@ -1,3 +1,4 @@
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.coverage.view;
 
 import com.intellij.coverage.CoverageBundle;
@@ -8,11 +9,12 @@ import com.intellij.ide.SelectInTarget;
 import com.intellij.ide.StandardTargetWeights;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NotNull;
 
-public class SelectInCoverageView implements  SelectInTarget {
+final class SelectInCoverageView implements SelectInTarget {
   private final Project myProject;
 
-  public SelectInCoverageView(Project project) {
+  private SelectInCoverageView(@NotNull Project project) {
     myProject = project;
   }