diff --git a/packages/pg-cloudflare/esm/index.js b/packages/pg-cloudflare/esm/index.js
deleted file mode 100644
index bed31286..00000000
--- a/packages/pg-cloudflare/esm/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// ESM wrapper for pg-cloudflare
-import module from '../dist/empty.js'
-
-// Re-export any named exports and the default
-export const CloudflareSocket = module.CloudflareSocket
-export default module
diff --git a/packages/pg-cloudflare/esm/worker.js b/packages/pg-cloudflare/esm/worker.js
deleted file mode 100644
index 9edce186..00000000
--- a/packages/pg-cloudflare/esm/worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// ESM wrapper for pg-cloudflare in Cloudflare Workers
-import module from '../dist/index.js'
-
-// Re-export CloudflareSocket and the default
-export const CloudflareSocket = module.CloudflareSocket
-export default module
diff --git a/packages/pg-cloudflare/package.json b/packages/pg-cloudflare/package.json
index 30ddcc85..bd687eb3 100644
--- a/packages/pg-cloudflare/package.json
+++ b/packages/pg-cloudflare/package.json
@@ -4,23 +4,12 @@
   "description": "A socket implementation that can run on Cloudflare Workers using native TCP connections.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "type": "module",
   "license": "MIT",
   "devDependencies": {
     "ts-node": "^8.5.4",
     "typescript": "^4.0.3"
   },
-  "exports": {
-    ".": {
-      "import": "./esm/worker.js",
-      "require": "./dist/index.js",
-      "default": "./dist/index.js"
-    },
-    "./worker": {
-      "import": "./esm/worker.js",
-      "require": "./dist/index.js",
-      "default": "./dist/index.js"
-    }
-  },
   "scripts": {
     "build": "tsc",
     "build:watch": "tsc --watch",
diff --git a/packages/pg-connection-string/esm/index.js b/packages/pg-connection-string/esm/index.mjs
similarity index 53%
rename from packages/pg-connection-string/esm/index.js
rename to packages/pg-connection-string/esm/index.mjs
index f749c673..eb2d0c0f 100644
--- a/packages/pg-connection-string/esm/index.js
+++ b/packages/pg-connection-string/esm/index.mjs
@@ -3,6 +3,5 @@ import connectionString from '../index.js'
 
 // Re-export the parse function
 export const parse = connectionString.parse
-
-// Re-export the default
-export default connectionString
+export const toClientConfig = connectionString.toClientConfig
+export const parseIntoClientConfig = connectionString.parseIntoClientConfig
diff --git a/packages/pg-connection-string/package.json b/packages/pg-connection-string/package.json
index e3bc6945..fd44db04 100644
--- a/packages/pg-connection-string/package.json
+++ b/packages/pg-connection-string/package.json
@@ -7,7 +7,7 @@
   "exports": {
     ".": {
       "types": "./index.d.ts",
-      "import": "./esm/index.js",
+      "import": "./esm/index.mjs",
       "require": "./index.js",
       "default": "./index.js"
     }
diff --git a/packages/pg-esm-test/package.json b/packages/pg-esm-test/package.json
index 53a75b7e..ab0785db 100644
--- a/packages/pg-esm-test/package.json
+++ b/packages/pg-esm-test/package.json
@@ -13,10 +13,11 @@
     "esm",
     "test"
   ],
-  "dependencies": {
+  "devDependencies": {
     "pg": "^8.14.1",
     "pg-pool": "^3.8.0",
-    "pg-native": "^3.3.0"
+    "pg-native": "^3.3.0",
+    "pg-cloudflare": "^1.1.1"
   },
   "author": "Brian M. Carlson <brian.m.carlson@gmail.com>",
   "license": "MIT"
diff --git a/packages/pg-esm-test/pg-cloudflare.test.js b/packages/pg-esm-test/pg-cloudflare.test.js
new file mode 100644
index 00000000..015ca171
--- /dev/null
+++ b/packages/pg-esm-test/pg-cloudflare.test.js
@@ -0,0 +1,9 @@
+import assert from 'node:assert'
+import { describe, it } from 'node:test'
+import { CloudflareSocket } from 'pg-cloudflare'
+
+describe('pg-pool', () => {
+  it('should export CloudflareSocket constructor', () => {
+    assert.ok(new CloudflareSocket())
+  })
+})
diff --git a/packages/pg-esm-test/pg-connection-string.test.js b/packages/pg-esm-test/pg-connection-string.test.js
new file mode 100644
index 00000000..9914fe5d
--- /dev/null
+++ b/packages/pg-esm-test/pg-connection-string.test.js
@@ -0,0 +1,17 @@
+import assert from 'node:assert'
+import { describe, it } from 'node:test'
+import { parse, toClientConfig, parseIntoClientConfig } from 'pg-connection-string'
+
+describe('pg-connection-string', () => {
+  it('should export parse function', () => {
+    assert.strictEqual(typeof parse, 'function')
+  })
+
+  it('should export toClientConfig function', () => {
+    assert.strictEqual(typeof toClientConfig, 'function')
+  })
+
+  it('should export parseIntoClientConfig function', () => {
+    assert.strictEqual(typeof parseIntoClientConfig, 'function')
+  })
+})
diff --git a/packages/pg-esm-test/pg-native.test.js b/packages/pg-esm-test/pg-native.test.js
index c7a9f83f..2663669e 100644
--- a/packages/pg-esm-test/pg-native.test.js
+++ b/packages/pg-esm-test/pg-native.test.js
@@ -1,4 +1,3 @@
-// test/my-module.test.js
 import assert from 'node:assert'
 import { describe, it } from 'node:test'
 import Client from 'pg-native'
diff --git a/packages/pg-esm-test/pg-pool.test.js b/packages/pg-esm-test/pg-pool.test.js
index d2dbbc79..ee0d23f1 100644
--- a/packages/pg-esm-test/pg-pool.test.js
+++ b/packages/pg-esm-test/pg-pool.test.js
@@ -1,4 +1,3 @@
-// test/my-module.test.js
 import assert from 'node:assert'
 import { describe, it } from 'node:test'
 import Pool from 'pg-pool'
diff --git a/packages/pg-esm-test/pg.test.js b/packages/pg-esm-test/pg.test.js
index 696a1cdc..382b3621 100644
--- a/packages/pg-esm-test/pg.test.js
+++ b/packages/pg-esm-test/pg.test.js
@@ -1,4 +1,3 @@
-// test/my-module.test.js
 import assert from 'node:assert'
 import { describe, it } from 'node:test'
 import pg, { Client, Pool } from 'pg'