diff --git a/test/3_Mediator.js b/test/3_Mediator.js
index eb98885..2ecd723 100644
--- a/test/3_Mediator.js
+++ b/test/3_Mediator.js
@@ -72,6 +72,9 @@ describe("Mediator", () => {
 
 		return mediator.init().then(() => {
 
+			strictEqual(typeof mediator.initialized, "boolean", "Generated mediator is not as expected");
+			strictEqual(mediator.initialized, true, "Generated mediator is not as expected");
+
 			return mediator.release();
 
 		}).then(() => {
@@ -131,11 +134,9 @@ describe("Mediator", () => {
 			return new Promise((resolve, reject) => {
 
 				mediator
-					.once("test", resolve);
+					.once("initialized", resolve);
 
-				mediator.init().then(() => {
-					mediator.emit("test");
-				}).catch(reject);
+				mediator.init().catch(reject);
 
 			});
 
@@ -147,9 +148,11 @@ describe("Mediator", () => {
 
 			return new Promise((resolve, reject) => {
 
-				mediator.once("test", () => {
-					reject(new Error("Should not fire this event"));
-				});
+				mediator
+					.once("test", () => {
+						reject(new Error("Should not fire this event"));
+					})
+					.once("released", resolve);
 
 				mediator.init().then(() => {
 					return mediator.release();
@@ -157,7 +160,7 @@ describe("Mediator", () => {
 
 					mediator.emit("test");
 
-					resolve();
+					return Promise.resolve();
 
 				}).catch(reject);
 
diff --git a/test/6_Orchestrator.js b/test/6_Orchestrator.js
index f201ba5..7d8b71e 100644
--- a/test/6_Orchestrator.js
+++ b/test/6_Orchestrator.js
@@ -731,11 +731,9 @@ describe("Orchestrator", () => {
 			return new Promise((resolve, reject) => {
 
 				orchestrator
-					.once("test", resolve);
+					.once("initialized", resolve);
 
-				orchestrator.init().then(() => {
-					orchestrator.emit("test");
-				}).catch(reject);
+				orchestrator.init().catch(reject);
 
 			});
 
@@ -747,17 +745,19 @@ describe("Orchestrator", () => {
 
 			return new Promise((resolve, reject) => {
 
-				orchestrator.once("test", () => {
-					reject(new Error("Should not fire this event"));
-				});
+				orchestrator
+					.once("test", () => {
+						reject(new Error("Should not fire this event"));
+					})
+					.once("released", resolve);
 
 				orchestrator.init().then(() => {
 					return orchestrator.release();
 				}).then(() => {
 
-					orchestrator.emit("test");
+					mediator.emit("test");
 
-					resolve();
+					return Promise.resolve();
 
 				}).catch(reject);