diff --git a/go4k/asmformat.go b/go4k/asmformat.go
index 80c4f38..b9a8295 100644
--- a/go4k/asmformat.go
+++ b/go4k/asmformat.go
@@ -77,20 +77,13 @@ func DeserializeAsm(asmcode string) (*Song, error) {
 		if macroMatch != nil {
 			word, rest := macroMatch[1], macroMatch[2]
 			switch word {
-			case "define":
-				defineMatch := wordReg.FindStringSubmatch(rest)
-				if defineMatch != nil {
-					defineName, defineRest := defineMatch[1], defineMatch[2]
-					if defineName == "BPM" {
-						ints, err := parseNumbers(defineRest)
-						if err != nil {
-							return nil, err
-						}
-						bpm = ints[0]
-					} else if defineName == "OUTPUT_16BIT" {
-						output16Bit = true
-					}
+			case "BEGIN_SONG":
+				parameters, err := parseParams(rest)
+				if err != nil {
+					return nil, fmt.Errorf("Error parsing parameters: %v", err)
 				}
+				bpm = parameters["bpm"]
+				output16Bit = parameters["output_16bit"] == 1
 			case "PATTERN":
 				ints, err := parseNumbers(rest)
 				if err != nil {
@@ -253,15 +246,10 @@ func SerializeAsm(song *Song) (string, error) {
 		}
 		indentation--
 	}
-	// The actual printing starts here
-	println("%%define BPM %d", song.BPM)
-	if song.Output16Bit {
-		println("%%define OUTPUT_16BIT")
-	}
 	// delay modulation is pretty much the only %define that the asm preprocessor cannot figure out
 	// as the preprocessor has no clue if a SEND modulates a delay unit. So, unfortunately, for the
 	// time being, we need to figure during export if INCLUDE_DELAY_MODULATION needs to be defined.
-	delaymod := false
+	delaymod := 0
 	for i, instrument := range song.Patch.Instruments {
 		for j, unit := range instrument.Units {
 			if unit.Type == "send" {
@@ -277,16 +265,18 @@ func SerializeAsm(song *Song) (string, error) {
 					return "", fmt.Errorf("INSTRUMENT #%v / SEND #%v target unit %v out of range", i, j, unit.Parameters["unit"])
 				}
 				if song.Patch.Instruments[targetInstrument].Units[unit.Parameters["unit"]].Type == "delay" && unit.Parameters["port"] == 5 {
-					delaymod = true
+					delaymod = 1
 				}
 			}
 		}
 	}
-	if delaymod {
-		println("%%define INCLUDE_DELAY_MODULATION")
+	// The actual printing starts here
+	output_16bit := 0
+	if song.Output16Bit {
+		output_16bit = 1
 	}
-	println("")
 	println("%%include \"sointu/header.inc\"\n")
+	println("BEGIN_SONG BPM(%v),OUTPUT_16BIT(%v),CLIP_OUTPUT(0),DELAY_MODULATION(%v)\n", song.BPM, output_16bit, delaymod)
 	var patternTable [][]string
 	for _, pattern := range song.Patterns {
 		row := []string{"PATTERN"}
@@ -371,7 +361,7 @@ func SerializeAsm(song *Song) (string, error) {
 		printTable(align(samStrTable, "r"))
 		println("END_SAMPLE_OFFSETS\n")
 	}
-	println("%%include \"sointu/footer.inc\"")
+	println("END_SONG")
 	ret := b.String()
 	return ret, nil
 }
diff --git a/include/sointu/footer.inc b/include/sointu/footer.inc
index 23e588f..e01bc01 100644
--- a/include/sointu/footer.inc
+++ b/include/sointu/footer.inc
@@ -292,7 +292,7 @@ EXPORT MANGLE_FUNC(su_power,0)
 ;   Stack   :   sample row pushad output_ptr
 ;-------------------------------------------------------------------------------
 %macro output_sound 0
-    %ifndef OUTPUT_16BIT
+    %ifndef SU_OUTPUT_16BIT
         %ifndef SU_CLIP_OUTPUT ; The modern way. No need to clip; OS can do it.
             mov     _DI, [_SP+su_stack.bufferptr - su_stack.output_sound] ; edi containts ptr
             mov     _SI, PTRWORD su_synth_obj + su_synthworkspace.left
@@ -316,6 +316,7 @@ EXPORT MANGLE_FUNC(su_power,0)
                 cmp     ecx,2
                 jl      %%loop
             mov     dword [_SP+su_stack.bufferptr - su_stack.output_sound], _SI ; save esi back to stack
+            %define SU_INCLUDE_CLIP
         %endif
     %else ; 16-bit output, always clipped. This is a bit legacy method.
         mov     _SI, [_SP+su_stack.bufferptr - su_stack.output_sound] ; esi points to the output buffer
@@ -335,6 +336,7 @@ EXPORT MANGLE_FUNC(su_power,0)
             loop    %%loop
         mov     [_SP+su_stack.bufferptr - su_stack.output_sound], _SI ; save esi back to stack
         %define USE_C_32767
+        %define SU_INCLUDE_CLIP
     %endif
 %endmacro
 
diff --git a/include/sointu/header.inc b/include/sointu/header.inc
index 5b0bccb..f7d4c0f 100644
--- a/include/sointu/header.inc
+++ b/include/sointu/header.inc
@@ -1,9 +1,6 @@
 %ifndef SOINTU_INC
 %define SOINTU_INC
 
-; You will have to define a BPM for your song, e.g.
-; %define BPM 100
-
 %macro EXPORT 1
     global %1
     %1:
@@ -77,10 +74,6 @@
     %endif
 %endif
 
-%ifdef OUTPUT_16BIT
-    %define SU_INCLUDE_CLIP
-%endif
-
 %assign CUR_ID          2
 %define CMDS              ; CMDS is empty at first, no commands defined
 %define OPCODES         MANGLE_FUNC(su_op_advance,0),
@@ -114,7 +107,29 @@ section .text ; yasm throws section redeclaration warnings if strucs are defined
 %endif
 
 %define TOTAL_ROWS (MAX_PATTERNS*PATTERN_SIZE)
-%define SAMPLES_PER_ROW (SAMPLE_RATE*4*60/(BPM*16))
+%define SAMPLES_PER_ROW (SAMPLE_RATE*4*60/(SU_BPM*16))
+
+%macro BEGIN_SONG 4
+    %xdefine SU_BPM %1    
+    %if %2 == 1
+        %define SU_OUTPUT_16BIT        
+    %endif
+    %if %3 == 1
+        %define SU_CLIP_OUTPUT        
+    %endif
+    %if %4 == 1
+        %define INCLUDE_DELAY_MODULATION
+    %endif
+%endmacro
+
+%macro END_SONG 0
+    %include "sointu/footer.inc"
+%endmacro
+
+%define BPM(val)                val
+%define OUTPUT_16BIT(val)       val
+%define CLIP_OUTPUT(val)        val
+%define DELAY_MODULATION(val)   val
 
 %macro BEGIN_PATCH 0
     SECT_DATA(params)
diff --git a/tests/test_add.asm b/tests/test_add.asm
index 4ae08c9..665ae84 100644
--- a/tests/test_add.asm
+++ b/tests/test_add.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_add_stereo.asm b/tests/test_add_stereo.asm
index 0ddb0ac..0dd39ff 100644
--- a/tests/test_add_stereo.asm
+++ b/tests/test_add_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_addp.asm b/tests/test_addp.asm
index 3fa541f..b19ea42 100644
--- a/tests/test_addp.asm
+++ b/tests/test_addp.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_addp_stereo.asm b/tests/test_addp_stereo.asm
index 7a0fcc0..593a692 100644
--- a/tests/test_addp_stereo.asm
+++ b/tests/test_addp_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_aux.asm b/tests/test_aux.asm
index 30431f9..5110db5 100644
--- a/tests/test_aux.asm
+++ b/tests/test_aux.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_aux_stereo.asm b/tests/test_aux_stereo.asm
index 4b8edcb..b789e8f 100644
--- a/tests/test_aux_stereo.asm
+++ b/tests/test_aux_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -25,4 +25,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_chords.asm b/tests/test_chords.asm
index 16be451..6637261 100644
--- a/tests/test_chords.asm
+++ b/tests/test_chords.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64, 0, 0,0,68,0,0,0,66,0,0,0,69,0,0,0
     PATTERN  0,68, 0,0,71,0,0,0,69,0,0,0,73,0,0,0
@@ -25,4 +25,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_clip.asm b/tests/test_clip.asm
index f645051..351ee07 100644
--- a/tests/test_clip.asm
+++ b/tests/test_clip.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_clip_stereo.asm b/tests/test_clip_stereo.asm
index 5e11278..c1396df 100644
--- a/tests/test_clip_stereo.asm
+++ b/tests/test_clip_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_compressor.asm b/tests/test_compressor.asm
index d13a8eb..1dc293f 100644
--- a/tests/test_compressor.asm
+++ b/tests/test_compressor.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,64,64,64,64,64,64,64,64,64,64,64,65,65,65,65
     PATTERN 76, 0, 0, 0, 0, 0, 0, 0,76, 0, 0, 0, 0, 0, 0, 0
@@ -39,4 +39,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_compressor_stereo.asm b/tests/test_compressor_stereo.asm
index d857072..cf6639f 100644
--- a/tests/test_compressor_stereo.asm
+++ b/tests/test_compressor_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,64,64,64,64,64,64,64,64,64,64,64,65,65,65,65
     PATTERN 76, 0, 0, 0, 0, 0, 0, 0,76, 0, 0, 0, 0, 0, 0, 0
@@ -39,4 +39,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_crush.asm b/tests/test_crush.asm
index 6c8418b..d1447e7 100644
--- a/tests/test_crush.asm
+++ b/tests/test_crush.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_crush_stereo.asm b/tests/test_crush_stereo.asm
index 1ab2d45..c8b43bf 100644
--- a/tests/test_crush_stereo.asm
+++ b/tests/test_crush_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_delay.asm b/tests/test_delay.asm
index cc4b7a0..c3b45b8 100644
--- a/tests/test_delay.asm
+++ b/tests/test_delay.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -25,4 +25,4 @@ BEGIN_DELTIMES
     DELTIME 11025
 END_DELTIMES
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_delay_dampmod.asm b/tests/test_delay_dampmod.asm
index c478c6b..e4c62c9 100644
--- a/tests/test_delay_dampmod.asm
+++ b/tests/test_delay_dampmod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -27,4 +27,4 @@ BEGIN_DELTIMES
     DELTIME 11025
 END_DELTIMES
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_delay_drymod.asm b/tests/test_delay_drymod.asm
index 3ef9127..92cd50b 100644
--- a/tests/test_delay_drymod.asm
+++ b/tests/test_delay_drymod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -27,4 +27,4 @@ BEGIN_DELTIMES
     DELTIME 11025
 END_DELTIMES
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_delay_feedbackmod.asm b/tests/test_delay_feedbackmod.asm
index b6adcc5..c43229e 100644
--- a/tests/test_delay_feedbackmod.asm
+++ b/tests/test_delay_feedbackmod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -27,4 +27,4 @@ BEGIN_DELTIMES
     DELTIME 11025
 END_DELTIMES
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_delay_flanger.asm b/tests/test_delay_flanger.asm
index e722640..f8e1406 100644
--- a/tests/test_delay_flanger.asm
+++ b/tests/test_delay_flanger.asm
@@ -1,8 +1,7 @@
-%define BPM 100
-%define INCLUDE_DELAY_MODULATION
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(1)
+
 BEGIN_PATTERNS
     PATTERN 80,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0
 END_PATTERNS
@@ -28,4 +27,4 @@ BEGIN_DELTIMES
     DELTIME 1000
 END_DELTIMES
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_delay_notetracking.asm b/tests/test_delay_notetracking.asm
index b827fcb..8b4c3c0 100644
--- a/tests/test_delay_notetracking.asm
+++ b/tests/test_delay_notetracking.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -29,4 +29,4 @@ BEGIN_DELTIMES
     DELTIME 10787
 END_DELTIMES
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_delay_pregainmod.asm b/tests/test_delay_pregainmod.asm
index f5dfba3..9df4781 100644
--- a/tests/test_delay_pregainmod.asm
+++ b/tests/test_delay_pregainmod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -27,4 +27,4 @@ BEGIN_DELTIMES
     DELTIME 11025
 END_DELTIMES
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_delay_reverb.asm b/tests/test_delay_reverb.asm
index 46e7896..35fd548 100644
--- a/tests/test_delay_reverb.asm
+++ b/tests/test_delay_reverb.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -32,4 +32,4 @@ BEGIN_DELTIMES
     DELTIME 1618
 END_DELTIMES
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_delay_stereo.asm b/tests/test_delay_stereo.asm
index d061890..e24d7cd 100644
--- a/tests/test_delay_stereo.asm
+++ b/tests/test_delay_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -26,4 +26,4 @@ BEGIN_DELTIMES
     DELTIME 21025
 END_DELTIMES
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_distort.asm b/tests/test_distort.asm
index 55f4227..3236dd2 100644
--- a/tests/test_distort.asm
+++ b/tests/test_distort.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_distort_mod.asm b/tests/test_distort_mod.asm
index 0463df4..726de06 100644
--- a/tests/test_distort_mod.asm
+++ b/tests/test_distort_mod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_distort_stereo.asm b/tests/test_distort_stereo.asm
index 2c7fd87..e518862 100644
--- a/tests/test_distort_stereo.asm
+++ b/tests/test_distort_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -18,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_envelope.asm b/tests/test_envelope.asm
index 18ee1ca..d1d15e8 100644
--- a/tests/test_envelope.asm
+++ b/tests/test_envelope.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -18,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_envelope_16bit.asm b/tests/test_envelope_16bit.asm
index fd82ac8..f516d53 100644
--- a/tests/test_envelope_16bit.asm
+++ b/tests/test_envelope_16bit.asm
@@ -1,8 +1,7 @@
-%define BPM 100
-%define OUTPUT_16BIT
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(1),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -19,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_envelope_mod.asm b/tests/test_envelope_mod.asm
index 39b1a99..0772d37 100644
--- a/tests/test_envelope_mod.asm
+++ b/tests/test_envelope_mod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_envelope_stereo.asm b/tests/test_envelope_stereo.asm
index 126485b..6a809da 100644
--- a/tests/test_envelope_stereo.asm
+++ b/tests/test_envelope_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -17,4 +17,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_filter_band.asm b/tests/test_filter_band.asm
index 3d24467..900b4d6 100644
--- a/tests/test_filter_band.asm
+++ b/tests/test_filter_band.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_filter_freqmod.asm b/tests/test_filter_freqmod.asm
index 9d66f93..b0dcc19 100644
--- a/tests/test_filter_freqmod.asm
+++ b/tests/test_filter_freqmod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_filter_high.asm b/tests/test_filter_high.asm
index 35b94ee..0b1583d 100644
--- a/tests/test_filter_high.asm
+++ b/tests/test_filter_high.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_filter_low.asm b/tests/test_filter_low.asm
index edc2717..0d8affd 100644
--- a/tests/test_filter_low.asm
+++ b/tests/test_filter_low.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_filter_peak.asm b/tests/test_filter_peak.asm
index a093176..6b3d461 100644
--- a/tests/test_filter_peak.asm
+++ b/tests/test_filter_peak.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_filter_resmod.asm b/tests/test_filter_resmod.asm
index 0db6882..247274f 100644
--- a/tests/test_filter_resmod.asm
+++ b/tests/test_filter_resmod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_filter_stereo.asm b/tests/test_filter_stereo.asm
index e01b90c..dc1f421 100644
--- a/tests/test_filter_stereo.asm
+++ b/tests/test_filter_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_gain.asm b/tests/test_gain.asm
index afd4089..1693eca 100644
--- a/tests/test_gain.asm
+++ b/tests/test_gain.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_gain_stereo.asm b/tests/test_gain_stereo.asm
index 5e24529..206a985 100644
--- a/tests/test_gain_stereo.asm
+++ b/tests/test_gain_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_hold.asm b/tests/test_hold.asm
index b33b1b9..d6522f4 100644
--- a/tests/test_hold.asm
+++ b/tests/test_hold.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_hold_mod.asm b/tests/test_hold_mod.asm
index 76210ef..0b8ae20 100644
--- a/tests/test_hold_mod.asm
+++ b/tests/test_hold_mod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_hold_stereo.asm b/tests/test_hold_stereo.asm
index 2fc3bd5..8892872 100644
--- a/tests/test_hold_stereo.asm
+++ b/tests/test_hold_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_in.asm b/tests/test_in.asm
index 455dd02..0821a5c 100644
--- a/tests/test_in.asm
+++ b/tests/test_in.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_in_stereo.asm b/tests/test_in_stereo.asm
index 7980c72..17b8649 100644
--- a/tests/test_in_stereo.asm
+++ b/tests/test_in_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_invgain.asm b/tests/test_invgain.asm
index 965a44c..eff8439 100644
--- a/tests/test_invgain.asm
+++ b/tests/test_invgain.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_invgain_stereo.asm b/tests/test_invgain_stereo.asm
index b47506d..501d878 100644
--- a/tests/test_invgain_stereo.asm
+++ b/tests/test_invgain_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_loadnote.asm b/tests/test_loadnote.asm
index ae2b375..ff4c71a 100644
--- a/tests/test_loadnote.asm
+++ b/tests/test_loadnote.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -18,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_loadnote_stereo.asm b/tests/test_loadnote_stereo.asm
index 50218e0..26ff542 100644
--- a/tests/test_loadnote_stereo.asm
+++ b/tests/test_loadnote_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -17,4 +17,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_loadval.asm b/tests/test_loadval.asm
index 937c5bc..2437e8c 100644
--- a/tests/test_loadval.asm
+++ b/tests/test_loadval.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -18,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_loadval_stereo.asm b/tests/test_loadval_stereo.asm
index 7221ffc..487cbc6 100644
--- a/tests/test_loadval_stereo.asm
+++ b/tests/test_loadval_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -17,4 +17,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_mul.asm b/tests/test_mul.asm
index 31c5532..12bf961 100644
--- a/tests/test_mul.asm
+++ b/tests/test_mul.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_mul_stereo.asm b/tests/test_mul_stereo.asm
index 34e75bd..82757ab 100644
--- a/tests/test_mul_stereo.asm
+++ b/tests/test_mul_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_mulp.asm b/tests/test_mulp.asm
index 7592b20..186c971 100644
--- a/tests/test_mulp.asm
+++ b/tests/test_mulp.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_mulp_stereo.asm b/tests/test_mulp_stereo.asm
index e0fa257..d122144 100644
--- a/tests/test_mulp_stereo.asm
+++ b/tests/test_mulp_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_multiple_instruments.asm b/tests/test_multiple_instruments.asm
index 4d17018..19ee017 100644
--- a/tests/test_multiple_instruments.asm
+++ b/tests/test_multiple_instruments.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD, 0,  0,  0,0,0,0,0,0
     PATTERN  0,  0,  0,  0,  0,  0,  0,  0,64,HLD,HLD,0,0,0,0,0
@@ -25,4 +25,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_noise.asm b/tests/test_noise.asm
index 46ea108..03d58cb 100644
--- a/tests/test_noise.asm
+++ b/tests/test_noise.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_noise_stereo.asm b/tests/test_noise_stereo.asm
index c5f78cb..a240d51 100644
--- a/tests/test_noise_stereo.asm
+++ b/tests/test_noise_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_colormod.asm b/tests/test_oscillat_colormod.asm
index 7787086..3911845 100644
--- a/tests/test_oscillat_colormod.asm
+++ b/tests/test_oscillat_colormod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 80,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0
 END_PATTERNS
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_detunemod.asm b/tests/test_oscillat_detunemod.asm
index 374fe92..b32c2e0 100644
--- a/tests/test_oscillat_detunemod.asm
+++ b/tests/test_oscillat_detunemod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 80,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0
 END_PATTERNS
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_gainmod.asm b/tests/test_oscillat_gainmod.asm
index dc596ee..dad9fd7 100644
--- a/tests/test_oscillat_gainmod.asm
+++ b/tests/test_oscillat_gainmod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 80,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0
 END_PATTERNS
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_gate.asm b/tests/test_oscillat_gate.asm
index 84d7d95..2b4330c 100644
--- a/tests/test_oscillat_gate.asm
+++ b/tests/test_oscillat_gate.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_lfo.asm b/tests/test_oscillat_lfo.asm
index 97656fd..e5b8e38 100644
--- a/tests/test_oscillat_lfo.asm
+++ b/tests/test_oscillat_lfo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_phasemod.asm b/tests/test_oscillat_phasemod.asm
index 88e9374..d10efbe 100644
--- a/tests/test_oscillat_phasemod.asm
+++ b/tests/test_oscillat_phasemod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 80,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0
 END_PATTERNS
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_pulse.asm b/tests/test_oscillat_pulse.asm
index fbbf501..b20b3e3 100644
--- a/tests/test_oscillat_pulse.asm
+++ b/tests/test_oscillat_pulse.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_sample.asm b/tests/test_oscillat_sample.asm
index a6d7426..3c7cb91 100644
--- a/tests/test_oscillat_sample.asm
+++ b/tests/test_oscillat_sample.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN  0,  0,  0,  0,  0,  0,  0,0
     PATTERN 72,HLD,HLD,HLD,HLD,HLD,HLD,0
@@ -39,4 +39,4 @@ BEGIN_SAMPLE_OFFSETS
     SAMPLE_OFFSET START(1680142),LOOPSTART(1483), LOOPLENGTH(95)
 END_SAMPLE_OFFSETS
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_sample_stereo.asm b/tests/test_oscillat_sample_stereo.asm
index 1c7f736..fe2ceb4 100644
--- a/tests/test_oscillat_sample_stereo.asm
+++ b/tests/test_oscillat_sample_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN  0,  0,  0,  0,  0,  0,  0,0
     PATTERN 72,HLD,HLD,HLD,HLD,HLD,HLD,0
@@ -36,4 +36,4 @@ BEGIN_SAMPLE_OFFSETS
     SAMPLE_OFFSET START(1678611),LOOPSTART(1341),LOOPLENGTH(106)
 END_SAMPLE_OFFSETS
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_shapemod.asm b/tests/test_oscillat_shapemod.asm
index dccacb8..2f7913d 100644
--- a/tests/test_oscillat_shapemod.asm
+++ b/tests/test_oscillat_shapemod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 80,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0
 END_PATTERNS
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_sine.asm b/tests/test_oscillat_sine.asm
index a1855cb..cac8a38 100644
--- a/tests/test_oscillat_sine.asm
+++ b/tests/test_oscillat_sine.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_stereo.asm b/tests/test_oscillat_stereo.asm
index def8019..c57e117 100644
--- a/tests/test_oscillat_stereo.asm
+++ b/tests/test_oscillat_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_transposemod.asm b/tests/test_oscillat_transposemod.asm
index 6b0e220..c019e27 100644
--- a/tests/test_oscillat_transposemod.asm
+++ b/tests/test_oscillat_transposemod.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 80,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0
 END_PATTERNS
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_trisaw.asm b/tests/test_oscillat_trisaw.asm
index 5b68087..15f5b3f 100644
--- a/tests/test_oscillat_trisaw.asm
+++ b/tests/test_oscillat_trisaw.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_unison.asm b/tests/test_oscillat_unison.asm
index 506950f..ec2c6de 100644
--- a/tests/test_oscillat_unison.asm
+++ b/tests/test_oscillat_unison.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_oscillat_unison_stereo.asm b/tests/test_oscillat_unison_stereo.asm
index e630a73..544aed5 100644
--- a/tests/test_oscillat_unison_stereo.asm
+++ b/tests/test_oscillat_unison_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,68,0,32,0,0,0,75,0,78,0,0,0,0,0
 END_PATTERNS
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_outaux.asm b/tests/test_outaux.asm
index b3dc87b..c0f2b25 100644
--- a/tests/test_outaux.asm
+++ b/tests/test_outaux.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_outaux_stereo.asm b/tests/test_outaux_stereo.asm
index 1a841c3..3feb286 100644
--- a/tests/test_outaux_stereo.asm
+++ b/tests/test_outaux_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -24,4 +24,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_panning.asm b/tests/test_panning.asm
index d74a7b7..2a8c199 100644
--- a/tests/test_panning.asm
+++ b/tests/test_panning.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -18,4 +18,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_panning_stereo.asm b/tests/test_panning_stereo.asm
index 79d3dac..f071c90 100644
--- a/tests/test_panning_stereo.asm
+++ b/tests/test_panning_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_polyphony.asm b/tests/test_polyphony.asm
index b65ce78..3dd5816 100644
--- a/tests/test_polyphony.asm
+++ b/tests/test_polyphony.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,68,HLD,32,HLD,HLD,HLD,75,HLD,78,HLD,HLD,0,0,0
 END_PATTERNS
@@ -29,4 +29,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_pop.asm b/tests/test_pop.asm
index 837b177..d43c2a4 100644
--- a/tests/test_pop.asm
+++ b/tests/test_pop.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_pop_stereo.asm b/tests/test_pop_stereo.asm
index 9743c01..ec29eee 100644
--- a/tests/test_pop_stereo.asm
+++ b/tests/test_pop_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_push.asm b/tests/test_push.asm
index b9949a1..27bff06 100644
--- a/tests/test_push.asm
+++ b/tests/test_push.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -20,4 +20,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_push_stereo.asm b/tests/test_push_stereo.asm
index dbaacaf..86d4231 100644
--- a/tests/test_push_stereo.asm
+++ b/tests/test_push_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -21,4 +21,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_receive.asm b/tests/test_receive.asm
index af602a0..e2a1ec4 100644
--- a/tests/test_receive.asm
+++ b/tests/test_receive.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_receive_stereo.asm b/tests/test_receive_stereo.asm
index 76956c3..ae072bb 100644
--- a/tests/test_receive_stereo.asm
+++ b/tests/test_receive_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -22,4 +22,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_send.asm b/tests/test_send.asm
index b353e0e..3431bb8 100644
--- a/tests/test_send.asm
+++ b/tests/test_send.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_send_global.asm b/tests/test_send_global.asm
index 428a55a..3b9eefc 100644
--- a/tests/test_send_global.asm
+++ b/tests/test_send_global.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -27,4 +27,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_send_stereo.asm b/tests/test_send_stereo.asm
index a1d8623..b028f5a 100644
--- a/tests/test_send_stereo.asm
+++ b/tests/test_send_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_speed.asm b/tests/test_speed.asm
index 4bf923f..2760ff5 100644
--- a/tests/test_speed.asm
+++ b/tests/test_speed.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,0,64,64,64,0,64,64,64,0,64,64,65,0,65,65
     PATTERN 64,0, 0, 0, 0,0, 0, 0, 0,0, 0, 0, 0,0, 0, 0
@@ -28,4 +28,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_xch.asm b/tests/test_xch.asm
index 7d57b4e..a89b3cb 100644
--- a/tests/test_xch.asm
+++ b/tests/test_xch.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -19,4 +19,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG
diff --git a/tests/test_xch_stereo.asm b/tests/test_xch_stereo.asm
index 1b9aeaf..8447220 100644
--- a/tests/test_xch_stereo.asm
+++ b/tests/test_xch_stereo.asm
@@ -1,7 +1,7 @@
-%define BPM 100
-
 %include "sointu/header.inc"
 
+BEGIN_SONG BPM(100),OUTPUT_16BIT(0),CLIP_OUTPUT(0),DELAY_MODULATION(0)
+
 BEGIN_PATTERNS
     PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD,0,0,0,0,0,0,0,0
 END_PATTERNS
@@ -23,4 +23,4 @@ BEGIN_PATCH
     END_INSTRUMENT
 END_PATCH
 
-%include "sointu/footer.inc"
+END_SONG