diff --git a/Source/UnitTests/Core/DSP/DSPTestText.cpp b/Source/UnitTests/Core/DSP/DSPTestText.cpp
index 2e1f60a450..bc02ef1ba2 100644
--- a/Source/UnitTests/Core/DSP/DSPTestText.cpp
+++ b/Source/UnitTests/Core/DSP/DSPTestText.cpp
@@ -89,7 +89,7 @@ MEM_LO:			equ		0x0f7F
 	CW		0x1305
 	CW		0x1306
 
-	s40
+	s16
 	lri		$r12, #0x00ff
 
 main:
@@ -469,7 +469,7 @@ irq4:
 	jmp		irq
 irq5:
 ;	jmp finale
-	s40
+	s16
 	mrr		$r0d, $r1c
 	mrr		$r0d, $r1e
 	clr		$acc0
@@ -609,7 +609,7 @@ dma_copy:
 
 	ret
 
-send_back_16:
+send_back_40:
 
 	cw		0x8e00
 	call	send_back
diff --git a/Source/UnitTests/Core/DSP/HermesText.cpp b/Source/UnitTests/Core/DSP/HermesText.cpp
index 1b643a0c9b..fd59677d35 100644
--- a/Source/UnitTests/Core/DSP/HermesText.cpp
+++ b/Source/UnitTests/Core/DSP/HermesText.cpp
@@ -175,7 +175,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 	lri     $CONFIG, #0xff
 	lri	$SR,#0
-	s40         
+	s16         
 	clr15       
 	m0         
 
@@ -256,7 +256,7 @@ sys_command:
 	jmp		recv_cmd
 	
 run_nexttask:
-	s40
+	s16
 	call		wait_for_cpu_mail
 	lrs			$29,@CMBL
 	call		wait_for_cpu_mail
@@ -661,7 +661,7 @@ left_skip2:
 
 	cmp
 
-	jrl	$AR0 //get_sample or get_sample2 method
+	jrnc	$AR0 //get_sample or get_sample2 method
 
 	sr	@COUNTERH_SMP, $ACH1 
         sr	@COUNTERL_SMP, $ACM1
@@ -717,7 +717,7 @@ get_sample2: // slow method
 
 // if addr>addr end get a new buffer (if you uses double buffer)
 
-	jge	get_new_buffer
+	jc	get_new_buffer
 
 // load samples from dma, return $ar2 with the addr to get the samples and return using $ar0 to the routine to process 8-16bits Mono/Stereo
 
@@ -747,7 +747,7 @@ get_sample: // fast method
 // compares if the current address is >= end address to change the buffer or stops
 
 	cmp
-	jge	get_new_buffer
+	jc	get_new_buffer
 
 // load the new sample from the buffer