diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 0000000..2e958b0
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,7 @@
+tasks:
+  - init: npm i
+    command: npm start
+
+ports:
+  - port: 9000
+    onOpen: open-preview
diff --git a/README.md b/README.md
index 5e64843..03d6b8d 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 
 PeerServer helps broker connections between PeerJS clients. Data is not proxied through the server.
 
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/peers/peerjs-server)
+
 ## [https://peerjs.com](https://peerjs.com)
 
 ### Run PeerServer
diff --git a/package-lock.json b/package-lock.json
index ef5f636..b327dae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4738,6 +4738,11 @@
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
+    "uuid4": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/uuid4/-/uuid4-1.1.4.tgz",
+      "integrity": "sha512-Gr1q2k40LpF8CokcnQFjPDsdslzJbTCTBG5xQIEflUov431gFkY5KduiGIeKYAamkQnNn4IfdHJbLnl9Bib8TQ=="
+    },
     "v8-compile-cache": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
diff --git a/package.json b/package.json
index 4cae464..47dc2e8 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "cors": "~2.8.4",
     "express": "^4.17.1",
     "optimist": "~0.6.1",
+    "uuid4": "^1.1.4",
     "ws": "^7.1.2"
   },
   "devDependencies": {
@@ -53,6 +54,6 @@
     "typescript": "^3.5.3"
   },
   "engines": {
-    "node": "^10"
+    "node": ">=10"
   }
 }
diff --git a/test/models/realm.ts b/test/models/realm.ts
index 7ca8876..12608aa 100644
--- a/test/models/realm.ts
+++ b/test/models/realm.ts
@@ -4,9 +4,9 @@ import { Client } from '../../src/models/client';
 
 describe('Realm', () => {
   describe('#generateClientId', () => {
-    it('should generate a 16-character ID', () => {
+    it('should generate a 36-character UUID', () => {
       const realm = new Realm();
-      expect(realm.generateClientId().length).to.eq(16);
+      expect(realm.generateClientId().length).to.eq(36);
     });
   });
 
diff --git a/test/services/checkBrokenConnections/index.ts b/test/services/checkBrokenConnections/index.ts
index e81c49c..a9f6005 100644
--- a/test/services/checkBrokenConnections/index.ts
+++ b/test/services/checkBrokenConnections/index.ts
@@ -17,7 +17,7 @@ describe('checkBrokenConnections service', () => {
             expect(realm.getClientById('id')).to.be.undefined;
             checkBrokenConnections.stop();
             done();
-        }, checkBrokenConnections.checkInterval * 2 + 10);
+        }, checkBrokenConnections.checkInterval * 2 + 30);
     });
 
     it('should remove client after 1 ping', (done) => {