diff --git a/libraries/search-javascript/lib/testbuilding/ContextBuilder.ts b/libraries/search-javascript/lib/testbuilding/ContextBuilder.ts
index 8092921d2..63c4f7e3e 100644
--- a/libraries/search-javascript/lib/testbuilding/ContextBuilder.ts
+++ b/libraries/search-javascript/lib/testbuilding/ContextBuilder.ts
@@ -90,7 +90,7 @@ export class ContextBuilder {
     let variableName = statement.name;
 
     variableName =
-      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".includes(
+      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_".includes(
         variableName[0]
       )
         ? variableName[0].toLowerCase() + variableName.slice(1)
diff --git a/libraries/search-javascript/lib/testbuilding/JavaScriptDecoder.ts b/libraries/search-javascript/lib/testbuilding/JavaScriptDecoder.ts
index 8ea389e8e..1cc462bac 100644
--- a/libraries/search-javascript/lib/testbuilding/JavaScriptDecoder.ts
+++ b/libraries/search-javascript/lib/testbuilding/JavaScriptDecoder.ts
@@ -101,7 +101,12 @@ export class JavaScriptDecoder implements Decoder<JavaScriptTestCase, string> {
 
     if (requires.length > 0) {
       beforeEachLines = [
-        ...requires.map((m) => `\tlet ${m.left};`),
+        ...requires.map(
+          (m) =>
+            `\tlet ${(m.left.includes(":") ? m.left.split(":")[1] : m.left)
+              .replace("{", "")
+              .replace("}", "")};`
+        ),
         `\tbeforeEach(() => {`,
         "\t\t// This is a hack to force the require cache to be emptied",
         "\t\t// Without this we would be using the same required object for each test",
@@ -112,7 +117,7 @@ export class JavaScriptDecoder implements Decoder<JavaScriptTestCase, string> {
               "require.resolve"
             )}];`
         ),
-        ...requires.map((m) => `\t\t${m.left} = ${m.right}`),
+        ...requires.map((m) => `\t\t(${m.left} = ${m.right});`),
         `\t});`,
         "",
       ];
@@ -125,7 +130,7 @@ export class JavaScriptDecoder implements Decoder<JavaScriptTestCase, string> {
       `describe('${targetName}', function() {`,
       ...beforeEachLines,
       ...tests.flatMap((testLines: string[], index) => [
-        `\tit("Test ${index} for '${targetName}'", async () => {`,
+        `\tit("Test ${index + 1} for '${targetName}'", async () => {`,
         ...testLines.map((line) => `\t\t${line}`),
         index === tests.length - 1 ? "\t})" : "\t})\n",
       ]),
diff --git a/libraries/search-javascript/lib/testcase/sampling/JavaScriptRandomSampler.ts b/libraries/search-javascript/lib/testcase/sampling/JavaScriptRandomSampler.ts
index 252ac3409..55ec25391 100644
--- a/libraries/search-javascript/lib/testcase/sampling/JavaScriptRandomSampler.ts
+++ b/libraries/search-javascript/lib/testcase/sampling/JavaScriptRandomSampler.ts
@@ -325,8 +325,7 @@ export class JavaScriptRandomSampler extends JavaScriptTestCaseSampler {
       .filter((target) =>
         isExported(
           targets.find(
-            (objectTarget) =>
-              objectTarget.id === (<ObjectFunctionTarget>target).objectId
+            (objectTarget) => objectTarget.id === (<MethodTarget>target).classId
           )
         )
       );
@@ -353,8 +352,7 @@ export class JavaScriptRandomSampler extends JavaScriptTestCaseSampler {
       .filter((target) =>
         isExported(
           targets.find(
-            (objectTarget) =>
-              objectTarget.id === (<ObjectFunctionTarget>target).objectId
+            (objectTarget) => objectTarget.id === (<MethodTarget>target).classId
           )
         )
       );
@@ -381,8 +379,7 @@ export class JavaScriptRandomSampler extends JavaScriptTestCaseSampler {
       .filter((target) =>
         isExported(
           targets.find(
-            (objectTarget) =>
-              objectTarget.id === (<ObjectFunctionTarget>target).objectId
+            (objectTarget) => objectTarget.id === (<MethodTarget>target).classId
           )
         )
       );
diff --git a/package-lock.json b/package-lock.json
index c4de4a36a..61a7d8670 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,7 +56,6 @@
       }
     },
     "libraries/analysis-javascript": {
-      "name": "@syntest/analysis-javascript",
       "version": "0.1.0-beta.22",
       "license": "Apache-2.0",
       "dependencies": {
@@ -114,7 +113,6 @@
       }
     },
     "libraries/ast-visitor-javascript": {
-      "name": "@syntest/ast-visitor-javascript",
       "version": "0.1.0-beta.6",
       "license": "Apache-2.0",
       "dependencies": {
@@ -168,7 +166,6 @@
       }
     },
     "libraries/instrumentation-javascript": {
-      "name": "@syntest/instrumentation-javascript",
       "version": "0.1.0-beta.21",
       "license": "Apache-2.0",
       "dependencies": {
@@ -226,7 +223,6 @@
       }
     },
     "libraries/search-javascript": {
-      "name": "@syntest/search-javascript",
       "version": "0.1.0-beta.16",
       "license": "Apache-2.0",
       "dependencies": {
@@ -15771,7 +15767,6 @@
       }
     },
     "plugins/plugin-javascript-event-listener-state-storage": {
-      "name": "@syntest/plugin-javascript-event-listener-state-storage",
       "version": "0.1.0-beta.0",
       "license": "Apache-2.0",
       "dependencies": {
@@ -15789,7 +15784,6 @@
       }
     },
     "tools/javascript": {
-      "name": "@syntest/javascript",
       "version": "0.1.0-beta.24",
       "license": "Apache-2.0",
       "dependencies": {