diff --git a/package-lock.json b/package-lock.json
index 60de1902..ba81cfa5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,7 +49,7 @@
         "rollup-plugin-postcss": "^4.0.1",
         "rollup-plugin-serve": "^1.1.0",
         "rollup-plugin-typescript2": "^0.30.0",
-        "start-server-and-test": "^1.13.0",
+        "start-server-and-test": "^1.13.1",
         "typescript": "^4.4.2"
       },
       "peerDependencies": {
@@ -1902,9 +1902,9 @@
       "dev": true
     },
     "node_modules/@hapi/topo": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz",
-      "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
       "dev": true,
       "dependencies": {
         "@hapi/hoek": "^9.0.0"
@@ -5355,9 +5355,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
+      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==",
       "dev": true,
       "funding": [
         {
@@ -6487,9 +6487,9 @@
       "dev": true
     },
     "node_modules/joi": {
-      "version": "17.4.0",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz",
-      "integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==",
+      "version": "17.4.2",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz",
+      "integrity": "sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==",
       "dev": true,
       "dependencies": {
         "@hapi/hoek": "^9.0.0",
@@ -10224,9 +10224,9 @@
       "dev": true
     },
     "node_modules/start-server-and-test": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.13.0.tgz",
-      "integrity": "sha512-04A+a3Rja4X4Ha3JtpmSHY8cQMlH7HnGFUTWaMhfZuSodqek7KKd7qn65TYjFNNX9yJinM502wMUGGJi67i72w==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.13.1.tgz",
+      "integrity": "sha512-wZjksmjG5scEHXmV/3HWzImxNzUgaNQ6W8kkqL2GbiOldM+nqiqh7niimlC9ZGNopTGj16kheWZnZtSWgdBZNQ==",
       "dev": true,
       "dependencies": {
         "bluebird": "3.7.2",
@@ -10235,7 +10235,7 @@
         "execa": "5.1.1",
         "lazy-ass": "1.6.0",
         "ps-tree": "1.2.0",
-        "wait-on": "5.3.0"
+        "wait-on": "6.0.0"
       },
       "bin": {
         "server-test": "src/bin/start.js",
@@ -10943,22 +10943,31 @@
       }
     },
     "node_modules/wait-on": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz",
-      "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.0.tgz",
+      "integrity": "sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==",
       "dev": true,
       "dependencies": {
         "axios": "^0.21.1",
-        "joi": "^17.3.0",
+        "joi": "^17.4.0",
         "lodash": "^4.17.21",
         "minimist": "^1.2.5",
-        "rxjs": "^6.6.3"
+        "rxjs": "^7.1.0"
       },
       "bin": {
         "wait-on": "bin/wait-on"
       },
       "engines": {
-        "node": ">=8.9.0"
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/wait-on/node_modules/rxjs": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz",
+      "integrity": "sha512-p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "~2.1.0"
       }
     },
     "node_modules/wcwidth": {
@@ -12474,9 +12483,9 @@
       "dev": true
     },
     "@hapi/topo": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz",
-      "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
       "dev": true,
       "requires": {
         "@hapi/hoek": "^9.0.0"
@@ -15186,9 +15195,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
+      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==",
       "dev": true
     },
     "forever-agent": {
@@ -15986,9 +15995,9 @@
       "dev": true
     },
     "joi": {
-      "version": "17.4.0",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz",
-      "integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==",
+      "version": "17.4.2",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz",
+      "integrity": "sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==",
       "dev": true,
       "requires": {
         "@hapi/hoek": "^9.0.0",
@@ -18730,9 +18739,9 @@
       "dev": true
     },
     "start-server-and-test": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.13.0.tgz",
-      "integrity": "sha512-04A+a3Rja4X4Ha3JtpmSHY8cQMlH7HnGFUTWaMhfZuSodqek7KKd7qn65TYjFNNX9yJinM502wMUGGJi67i72w==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.13.1.tgz",
+      "integrity": "sha512-wZjksmjG5scEHXmV/3HWzImxNzUgaNQ6W8kkqL2GbiOldM+nqiqh7niimlC9ZGNopTGj16kheWZnZtSWgdBZNQ==",
       "dev": true,
       "requires": {
         "bluebird": "3.7.2",
@@ -18741,7 +18750,7 @@
         "execa": "5.1.1",
         "lazy-ass": "1.6.0",
         "ps-tree": "1.2.0",
-        "wait-on": "5.3.0"
+        "wait-on": "6.0.0"
       },
       "dependencies": {
         "execa": {
@@ -19277,16 +19286,27 @@
       }
     },
     "wait-on": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz",
-      "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.0.tgz",
+      "integrity": "sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw==",
       "dev": true,
       "requires": {
         "axios": "^0.21.1",
-        "joi": "^17.3.0",
+        "joi": "^17.4.0",
         "lodash": "^4.17.21",
         "minimist": "^1.2.5",
-        "rxjs": "^6.6.3"
+        "rxjs": "^7.1.0"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "7.3.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.3.0.tgz",
+          "integrity": "sha512-p2yuGIg9S1epc3vrjKf6iVb3RCaAYjYskkO+jHIaV0IjOPlJop4UnodOoFb2xeNwlguqLYvGw1b1McillYb5Gw==",
+          "dev": true,
+          "requires": {
+            "tslib": "~2.1.0"
+          }
+        }
       }
     },
     "wcwidth": {
diff --git a/package.json b/package.json
index c00758ae..45445f4f 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "rollup-plugin-postcss": "^4.0.1",
     "rollup-plugin-serve": "^1.1.0",
     "rollup-plugin-typescript2": "^0.30.0",
-    "start-server-and-test": "^1.13.0",
+    "start-server-and-test": "^1.13.1",
     "typescript": "^4.4.2"
   },
   "peerDependencies": {