diff --git a/include/sointu/footer.inc b/include/sointu/footer.inc
index 39d8a64..3ae66fe 100644
--- a/include/sointu/footer.inc
+++ b/include/sointu/footer.inc
@@ -546,7 +546,7 @@ c_freq_normalize        dd      0.000092696138  ; // 220.0/(2^(69/12)) / 44100.0
 %endif
 
 %ifdef USE_C_BPMSCALE
-    c_bpmscale          dd      2.666666666666 ; 64/24, 24 values will be double speed, so you can go from ~ 1/2.5 speed to 2.5x speed
+    c_bpmscale          dd      2.206896551724138 ; 64/29, 29 values will be double speed, so you can go from ~ 1/2.2 speed to 2.2x speed
 %endif
 
 %ifdef USE_C_16
diff --git a/tests/expected_output/test_speed.raw b/tests/expected_output/test_speed.raw
index b6ca883..a6be264 100644
Binary files a/tests/expected_output/test_speed.raw and b/tests/expected_output/test_speed.raw differ
diff --git a/tests/test_renderer.c b/tests/test_renderer.c
index 5ad5b10..b85b4b5 100644
--- a/tests/test_renderer.c
+++ b/tests/test_renderer.c
@@ -50,12 +50,14 @@ int main(int argc, char* argv[]) {
     float v;
     bufsize = su_max_samples * 2 * sizeof(float);
     buf = (float*)malloc(bufsize);
+    memset(buf, 0, bufsize);
 #else
     short* buf = NULL;
     short* filebuf = NULL;
     short v;
     bufsize = su_max_samples * 2 * sizeof(short);
     buf = (short*)malloc(bufsize);
+    memset(buf, 0, bufsize);
 #endif
 
     if (buf == NULL) {
diff --git a/tests/test_speed.asm b/tests/test_speed.asm
index 8a245e1..4bf923f 100644
--- a/tests/test_speed.asm
+++ b/tests/test_speed.asm
@@ -5,7 +5,7 @@
 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
-    PATTERN 78,0,54, 0,78,0,54, 0,78,0,54, 0,78,0,54, 0
+    PATTERN 81,0,52, 0,81,0,52, 0,81,0,52, 0,81,0,52, 0
 END_PATTERNS
 
 BEGIN_TRACKS