diff --git a/eventWatcher.js b/eventWatcher.js
index c9c3b75..0821372 100644
--- a/eventWatcher.js
+++ b/eventWatcher.js
@@ -1,7 +1,7 @@
 const db = global.db;
 const { EventEmitter } = require('events');
 const log = require("./logger");
-require("dotenv").config({quiet:true});
+require("dotenv").config({ quiet: true });
 
 log.info("Starting event watcher...");
 
@@ -92,12 +92,21 @@ dataTypes = {
 }
 
 const validEvents = {
-	1: [1,2,3,6,7],
+	1: [1, 2, 3, 6, 7],
 	2: [25],
-	3: [23,24,28,37,38,39,40,41,42,43,44,45]
+	3: [23, 24, 28, 37, 38, 39, 40, 41, 42, 43, 44, 45]
 }
 
 if (process.env.EVENT_TESTING == true) {
+
+}
+
+(async () => {
+	await getLastEventIndex();
+	await fetchEvents();
+})();
+test = true
+if (test == true) {
 	log.warn("EVENT_TESTING is enabled - generating test events");
 	setInterval(() => {
 		const eventTypes = Object.keys(validEvents);
@@ -119,12 +128,7 @@ if (process.env.EVENT_TESTING == true) {
 		}
 		log.info(`Generated test event: ${JSON.stringify(testEvent)}`);
 		emitter.emit('event', testEvent);
-	}, 1000);			
+	}, 1000);
 }
 
-(async () => {
-	await getLastEventIndex();
-	await fetchEvents();
-})();
-
 module.exports = emitter;
\ No newline at end of file