diff --git a/src/analysis.ts b/src/analysis.ts
index 3ea0fbac..ef50f0ae 100644
--- a/src/analysis.ts
+++ b/src/analysis.ts
@@ -110,7 +110,7 @@ export async function analyzeFolders(options: FileAnalysisOptions): Promise<File
     ...options.connection,
     ...options.analysisOptions,
     shard: calcHash(fileBundle.baseDir),
-    analysisContext: options.analysisContext,
+    ...(options.analysisContext ? { analysisContext: options.analysisContext } : {}),
   });
 
   if (analysisResults.type === 'legacy') {
diff --git a/src/constants.ts b/src/constants.ts
index f572b60b..f86434b7 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -2,7 +2,6 @@ import { CustomDCIgnore, DefaultDCIgnore } from '@deepcode/dcignore';
 
 export const MAX_PAYLOAD = 4 * 1024 * 1024;
 export const MAX_FILE_SIZE = 128 * 1024;
-export const defaultBaseURL = 'https://api.snyk.deepcode.ai';
 export const HASH_ALGORITHM = 'sha256';
 export const ENCODE_TYPE = 'hex';
 export const GIT_FILENAME = '.git';
diff --git a/tests/analysis.spec.ts b/tests/analysis.spec.ts
index 0e57fdf2..81af2e76 100644
--- a/tests/analysis.spec.ts
+++ b/tests/analysis.spec.ts
@@ -82,9 +82,8 @@ describe('Functional test of analysis', () => {
           bundle.analysisResults.sarif.runs[0].tool.driver.rules![sampleRes.ruleIndex].id,
         );
 
-        expect(bundle.analysisResults.timing.analysis).toBeGreaterThanOrEqual(
-          bundle.analysisResults.timing.fetchingCode,
-        );
+        expect(bundle.analysisResults.timing.analysis).toBeGreaterThanOrEqual(0);
+        expect(bundle.analysisResults.timing.fetchingCode).toBeGreaterThanOrEqual(0);
         expect(bundle.analysisResults.timing.queue).toBeGreaterThanOrEqual(0);
         expect(new Set(bundle.analysisResults.coverage)).toEqual(
           new Set([
@@ -265,9 +264,8 @@ describe('Functional test of analysis', () => {
         if (!sampleRes.ruleIndex) return; // TS trick
         expect(sampleRes.ruleId).toEqual(sarifResults.runs[0].tool.driver.rules![sampleRes.ruleIndex].id);
 
-        expect(extendedBundle.analysisResults.timing.analysis).toBeGreaterThanOrEqual(
-          extendedBundle.analysisResults.timing.fetchingCode,
-        );
+        expect(extendedBundle.analysisResults.timing.analysis).toBeGreaterThanOrEqual(0);
+        expect(extendedBundle.analysisResults.timing.fetchingCode).toBeGreaterThanOrEqual(0);
         expect(extendedBundle.analysisResults.timing.queue).toBeGreaterThanOrEqual(0);
         expect(new Set(extendedBundle.analysisResults.coverage)).toEqual(
           new Set([