diff --git a/codegpt-telemetry/src/main/java/ee/carlrobert/codegpt/telemetry/core/service/segment/SegmentBroker.java b/codegpt-telemetry/src/main/java/ee/carlrobert/codegpt/telemetry/core/service/segment/SegmentBroker.java
index b0f1fdaa..37462c7b 100644
--- a/codegpt-telemetry/src/main/java/ee/carlrobert/codegpt/telemetry/core/service/segment/SegmentBroker.java
+++ b/codegpt-telemetry/src/main/java/ee/carlrobert/codegpt/telemetry/core/service/segment/SegmentBroker.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package ee.carlrobert.codegpt.telemetry.core.service.segment;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.rudderstack.sdk.java.analytics.RudderAnalytics;
 import com.rudderstack.sdk.java.analytics.messages.IdentifyMessage;
@@ -96,6 +97,10 @@ public class SegmentBroker implements IMessageBroker {
 
     @Override
     public void send(TelemetryEvent event) {
+        if (ApplicationManager.getApplication().isUnitTestMode()) {
+            return;
+        }
+
         try {
             if (analytics.get() == null) {
                 LOGGER.warn("Could not send " + event.getType() + " event '" + event.getName() + "': no analytics instance present.");
diff --git a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionServiceOld.java b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionServiceOld.java
index a5fa48c0..039f4962 100644
--- a/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionServiceOld.java
+++ b/src/main/java/ee/carlrobert/codegpt/codecompletions/CodeCompletionServiceOld.java
@@ -33,7 +33,6 @@ import com.intellij.util.concurrency.annotations.RequiresReadLock;
 import com.intellij.util.concurrency.annotations.RequiresWriteLock;
 import ee.carlrobert.codegpt.CodeGPTKeys;
 import ee.carlrobert.codegpt.actions.CodeCompletionEnabledListener;
-import ee.carlrobert.codegpt.completions.CompletionRequestService;
 import ee.carlrobert.codegpt.settings.configuration.ConfigurationSettings;
 import ee.carlrobert.codegpt.util.EditorUtil;
 import java.awt.event.KeyEvent;
@@ -98,9 +97,10 @@ public final class CodeCompletionServiceOld implements Disposable {
 
     callDebouncer.debounce(
         Void.class,
-        (progressIndicator) -> CompletionRequestService.getInstance().getCodeCompletionAsync(
-            request,
-            new CodeCompletionEventListener(editor, offset, request, progressIndicator)),
+        (progressIndicator) -> project.getService(CodeCompletionService.class)
+            .getCodeCompletionAsync(
+                request,
+                new CodeCompletionEventListener(editor, offset, request, progressIndicator)),
         750,
         TimeUnit.MILLISECONDS);
   }