diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index 34d966637d..3e7ed3ef43 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -699,7 +699,7 @@ var/list/recentmessages = list() // global list of recent messages broadcasted :
 //Use this to test if an obj can communicate with a Telecommunications Network
 
 /atom/proc/test_telecomms()
-	var/datum/signal/signal = telecomms_process()
+	var/datum/signal/signal = src.telecomms_process()
 	var/turf/position = get_turf(src)
 	return (position.z in signal.data["level"] && signal.data["done"])
 
@@ -708,6 +708,7 @@ var/list/recentmessages = list() // global list of recent messages broadcasted :
 	// First, we want to generate a new radio signal
 	var/datum/signal/signal = new
 	signal.transmission_method = 2 // 2 would be a subspace transmission.
+	var/turf/pos = get_turf(src)
 
 	// --- Finally, tag the actual signal with the appropriate values ---
 	signal.data = list(
@@ -718,18 +719,17 @@ var/list/recentmessages = list() // global list of recent messages broadcasted :
 		"type" = 4, // determines what type of radio input it is: test broadcast
 		"reject" = 0,
 		"done" = 0,
-		"level" = list() // The level it is being broadcasted at.
+		"level" = pos.z // The level it is being broadcasted at.
 	)
 	signal.frequency = 1459// Common channel
 
   //#### Sending the signal to all subspace receivers ####//
-	var/turf/position = get_turf(src)
 	for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
-		var/turf/receiver_turf = get_turf(R)
-		if(position.z == receiver_turf.z)
-			R.receive_signal(signal)
+		R.receive_signal(signal)
 
 	sleep(rand(10,25))
 
+	//world.log << "Level: [signal.data["level"]] - Done: [signal.data["done"]]"
+
 	return signal
 
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index c35cccc2a0..c0aac4c046 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -282,6 +282,10 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 	if(signal.transmission_method == 2)
 
 		if(is_freq_listening(signal)) // detect subspace signals
+
+			if(signal.data["type"] == 4) // If a test signal, remove the level and then start adding levels that it is being broadcasted in.
+				signal.data["level"] = list()
+
 			var/can_send = relay_information(signal, "/obj/machinery/telecomms/relay") // ideally relay the copied information to relays
 			if(!can_send)
 				relay_information(signal, "/obj/machinery/telecomms/bus") // Send it to a bus instead, if it's linked to one
diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm
index 9ce5d981a8..9a6a82d082 100644
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -718,7 +718,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				useMS = MS
 				break
 
-	var/datum/signal/signal = telecomms_process()
+	var/datum/signal/signal = src.telecomms_process()
 
 	var/useTC = 0
 	if(signal)