diff --git a/examples/signaling-server-nodejs/package.json b/examples/signaling-server-nodejs/package.json
index 25a3efa..2c2a497 100644
--- a/examples/signaling-server-nodejs/package.json
+++ b/examples/signaling-server-nodejs/package.json
@@ -2,7 +2,7 @@
   "name": "libdatachannel-signaling-server",
   "version": "0.1.0",
   "description": "Signaling server example for libdatachannel",
-  "main": "server.js",
+  "main": "signaling-server.js",
   "scripts": {
     "start": "node signaling-server.js",
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/examples/signaling-server-nodejs/signaling-server.js b/examples/signaling-server-nodejs/signaling-server.js
index 3a92f1f..849e64b 100644
--- a/examples/signaling-server-nodejs/signaling-server.js
+++ b/examples/signaling-server-nodejs/signaling-server.js
@@ -17,7 +17,6 @@
  * along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-const fs = require('fs');
 const http = require('http');
 const websocket = require('websocket');
 
diff --git a/test/benchmark.cpp b/test/benchmark.cpp
index 2969549..ddc3df5 100644
--- a/test/benchmark.cpp
+++ b/test/benchmark.cpp
@@ -121,12 +121,11 @@ size_t benchmark(milliseconds duration) {
 			}
 		} catch (const std::exception &e) {
 			std::cout << "Send failed: " << e.what() << std::endl;
-		}
-
-		// When sent data is buffered in the DataChannel,
-		// wait for onBufferedAmountLow callback to continue
+		}		
 	});
 
+	// When sent data is buffered in the DataChannel,
+	// wait for onBufferedAmountLow callback to continue
 	dc1->onBufferedAmountLow([wdc1 = make_weak_ptr(dc1), &messageData]() {
 		auto dc1 = wdc1.lock();
 		if (!dc1)
diff --git a/test/connectivity.cpp b/test/connectivity.cpp
index 5f19d3c..bd0f989 100644
--- a/test/connectivity.cpp
+++ b/test/connectivity.cpp
@@ -24,6 +24,8 @@
 #include <memory>
 #include <thread>
 
+#define CUSTOM_MAX_MESSAGE_SIZE 1048576
+
 using namespace rtc;
 using namespace std;
 
@@ -39,7 +41,7 @@ void test_connectivity() {
 	// Custom MTU example
 	config1.mtu = 1500;
 	// Custom max message size
-	config1.maxMessageSize = 1048576;
+	config1.maxMessageSize = CUSTOM_MAX_MESSAGE_SIZE;
 
 	PeerConnection pc1(config1);
 
@@ -50,7 +52,7 @@ void test_connectivity() {
 	// Custom MTU example
 	config2.mtu = 1500;
 	// Custom max message size
-	config2.maxMessageSize = 1048576;
+	config2.maxMessageSize = CUSTOM_MAX_MESSAGE_SIZE;
 	// Port range example
 	config2.portRangeBegin = 5000;
 	config2.portRangeEnd = 6000;
@@ -144,7 +146,7 @@ void test_connectivity() {
 	if (!adc2 || !adc2->isOpen() || !dc1->isOpen())
 		throw runtime_error("DataChannel is not open");
 
-	if (dc1->maxMessageSize() != 1048576 || dc2->maxMessageSize() != 1048576)
+	if (dc1->maxMessageSize() != CUSTOM_MAX_MESSAGE_SIZE || dc2->maxMessageSize() != CUSTOM_MAX_MESSAGE_SIZE)
 		throw runtime_error("DataChannel max message size is incorrect");
 
 	if (auto addr = pc1.localAddress())