diff --git a/libtest.png b/libtest.png
index af578af..d53f465 100644
Binary files a/libtest.png and b/libtest.png differ
diff --git a/libtest.scad b/libtest.scad
index 3d3d31a..091cf19 100644
--- a/libtest.scad
+++ b/libtest.scad
@@ -96,6 +96,7 @@ use <tests/rails.scad>
 use <tests/ring_terminals.scad>
 use <tests/rockers.scad>
 use <tests/rod.scad>
+use <tests/SBR_rails.scad>
 use <tests/screws.scad>
 use <tests/sealing_strip.scad>
 use <tests/servo_motors.scad>
@@ -144,7 +145,7 @@ x1 = x0 + 110;
 x2 = x1 + 90;
 x3 = x2 + 130;
 x4 = x3 + 200;
-x5 = 850;
+x5 = 900;
 x6 = x5 + 150;
 
 cable_grommets_y = 0;
@@ -233,8 +234,8 @@ tubings_y = sealing_strip_y + 20;
 pillars_y = tubings_y + 20;
 ball_bearings_y = pillars_y + 40;
 pulleys_y = ball_bearings_y + 40;
-leadnuts_y = pulleys_y + 60;
-linear_bearings_y = leadnuts_y + 50;
+leadnuts_y = pulleys_y + 35;
+linear_bearings_y = leadnuts_y + 65;
 steppers_y = linear_bearings_y + 110;
 sheets_y = steppers_y + 55;
 pcbs_y = sheets_y + 60;
@@ -289,7 +290,9 @@ translate([x0 + 120, leadnuts_y])
     leadnuthousings();
 
 translate([x0, linear_bearings_y]) {
-    linear_bearings();
+    translate([0, -30])
+        linear_bearings();
+
     rods();
 }
 
@@ -397,7 +400,7 @@ blowers_y = ssrs_y + 60;
 hot_ends_y = blowers_y + 100;
 batteries_y = hot_ends_y + 55;
 panel_meters_y = batteries_y + 70;
-extrusions_y = panel_meters_y + 80;
+extrusions_y = panel_meters_y + 100;
 
 translate([x3, veroboard_y])
     veroboard_test();
@@ -465,11 +468,11 @@ rails_y = belts_y + 200;
 extrusion_brackets_y = rails_y + 250;
 sk_brackets_y = extrusion_brackets_y + 80;
 kp_pillow_blocks_y = sk_brackets_y + 60;
-scs_bearing_blocks_y = kp_pillow_blocks_y + 60;
+bearing_blocks_y = kp_pillow_blocks_y + 60;
 box_sections_y = batteries_y;
-BLDC_y = scs_bearing_blocks_y + 120;
-pot_y = BLDC_y + 40;
-cable_strip_y = pot_y + 50;
+BLDC_y = bearing_blocks_y + 180;
+pot_y = bearing_blocks_y;
+cable_strip_y = sheets_y + 30;
 
 translate([0, transformers_y])
     servo_motors();
@@ -484,9 +487,13 @@ translate([x4 + 200, belts_y + 58]) {
 translate([x4 + 175, belts_y, -20])
     drag_chains();
 
-translate([x4, rails_y + 130])
+translate([x4, rails_y + 130]) {
     rails();
 
+    translate([305, 0])
+        sbr_rails();
+}
+
 translate([x4, cable_strip_y])
     cable_strips();
 
@@ -502,8 +509,8 @@ translate([x4, extrusion_brackets_y])
 translate([x1, swiss_clips_y + 50])
     shaft_couplings();
 
-translate([x4, scs_bearing_blocks_y])
-    scs_bearing_blocks();
+translate([x4, bearing_blocks_y])
+    bearing_blocks();
 
 translate([x4, BLDC_y])
     bldc_motors();
diff --git a/tests/SBR_rails.scad b/tests/SBR_rails.scad
index e25b331..cee1d45 100644
--- a/tests/SBR_rails.scad
+++ b/tests/SBR_rails.scad
@@ -1,5 +1,5 @@
 //
-// NopSCADlib Copyright Chris Palmer 2018
+// NopSCADlib Copyright Chris Palmer 2023
 // nop.head@gmail.com
 // hydraraptor.blogspot.com
 //
diff --git a/tests/bearing_blocks.scad b/tests/bearing_blocks.scad
index a85de88..aeaa19d 100644
--- a/tests/bearing_blocks.scad
+++ b/tests/bearing_blocks.scad
@@ -24,10 +24,11 @@ use <../utils/layout.scad>
 module scs_bearing_blocks()
     layout([for(s = scs_bearing_blocks) scs_size(s).x], 10) {
         part_thickness = 5;
-        scs_bearing_block_assembly(scs_bearing_blocks[$i], part_thickness);
+        translate([0, 60])
+            scs_bearing_block_assembly(scs_bearing_blocks[$i], part_thickness);
 
         if($i > 0) // skip $i==0, since no SCS6LUU long variant to match SCS6UU
-            translate([0, 60])
+            translate([0, 120])
                 scs_bearing_block_assembly(scs_bearing_blocks_long[$i - 1], part_thickness);
     }
 
@@ -37,10 +38,12 @@ module sbr_bearing_blocks()
         sbr_bearing_block_assembly(sbr_bearing_blocks[$i], part_thickness);
     }
 
-module bearing_blocks()
+module bearing_blocks() {
     scs_bearing_blocks();
-    translate([190,120,0])
+
+    translate([190, 0])
         sbr_bearing_blocks();
+}
 
 if($preview)
     bearing_blocks();
diff --git a/tests/circlips.scad b/tests/circlips.scad
index 98cdd54..64f1636 100644
--- a/tests/circlips.scad
+++ b/tests/circlips.scad
@@ -22,7 +22,7 @@ use <../utils/layout.scad>
 include <../vitamins/circlips.scad>
 
 module circlips(all = false)
-    layout([for(c = circlips) circlip_d3(c)], 10, false) let(c = circlips[$i]) {
+    layout([for(c = circlips) circlip_d3(c)], 5, false) let(c = circlips[$i]) {
         gap = circlip_d3(c) + 2;
 
         internal_circlip(c, 1);
diff --git a/tests/linear_bearings.scad b/tests/linear_bearings.scad
index de4fb2e..3eb4fe6 100644
--- a/tests/linear_bearings.scad
+++ b/tests/linear_bearings.scad
@@ -21,16 +21,18 @@ use <../utils/layout.scad>
 
 include <../vitamins/linear_bearings.scad>
 
-module linear_bearings()
+module linear_bearings() {
     layout([for(b = linear_bearings) 2 * bearing_radius(b)]) {
-        linear_bearing(linear_bearings[$i]);
-
         translate([0, 30])
+            linear_bearing(linear_bearings[$i]);
+
+        translate([0, 60])
             linear_bearing(long_linear_bearings[$i]);
     }
     layout([for(b = open_linear_bearings) 2 * bearing_radius(b)])
-        translate([105, 60])
+        translate([105, 0])
             linear_bearing(open_linear_bearings[$i]);
+}
 
 if($preview)
     linear_bearings();
diff --git a/tests/png/bearing_blocks.png b/tests/png/bearing_blocks.png
index e434466..a014156 100644
Binary files a/tests/png/bearing_blocks.png and b/tests/png/bearing_blocks.png differ
diff --git a/tests/png/bezier.png b/tests/png/bezier.png
index 35f2b31..775a84f 100644
Binary files a/tests/png/bezier.png and b/tests/png/bezier.png differ
diff --git a/tests/png/circlips.png b/tests/png/circlips.png
index ca59009..d5008aa 100644
Binary files a/tests/png/circlips.png and b/tests/png/circlips.png differ
diff --git a/tests/png/linear_bearings.png b/tests/png/linear_bearings.png
index 675045a..aed602b 100644
Binary files a/tests/png/linear_bearings.png and b/tests/png/linear_bearings.png differ
diff --git a/tests/png/sbr_rails.png b/tests/png/sbr_rails.png
index 2427c2e..37051a1 100644
Binary files a/tests/png/sbr_rails.png and b/tests/png/sbr_rails.png differ
diff --git a/vitamins/sbr_rail.scad b/vitamins/sbr_rail.scad
index 937a718..4fba78f 100644
--- a/vitamins/sbr_rail.scad
+++ b/vitamins/sbr_rail.scad
@@ -1,5 +1,5 @@
 //
-// NopSCADlib Copyright Chris Palmer 2018
+// NopSCADlib Copyright Chris Palmer 2023
 // nop.head@gmail.com
 // hydraraptor.blogspot.com
 //
@@ -53,8 +53,8 @@ module sbr_rail(type , l) { //! Draw an SBR rail
 
     vitamin(str("sbr_rail(", d, ", ", l, "): SBR", d, " rail, length ", l, "mm"));
 
-    not_on_bom() 
-        no_explode() 
+    not_on_bom()
+        no_explode()
             rod(d, l, center=true);
 
     base = (h1/2 + C/2) /2;  // guess, not clear from drawings
@@ -88,13 +88,13 @@ module sbr_rail(type , l) { //! Draw an SBR rail
 
         }
 
-    not_on_bom() 
-        no_explode() 
+    not_on_bom()
+        no_explode()
             color(screw_colour)
                 sbr_screw_locations(type, l)
                     translate([0,h-T,0])
                         rotate([270,0,0])
-                            screw(S3, S3L); 
+                            screw(S3, S3L);
 }
 
 module sbr_screw_locations(type, l) { //! Linear locations of screws
@@ -114,11 +114,11 @@ module sbr_screw_positions(type, l) { //! Screw positions
     T = type[4];
     C = type[8];
     S2 = sbr_rail_screw(type);
-    
+
     for (x = [-C/2, C/2])
         translate([x,h-T, 0])
             sbr_screw_locations(type, l)
                 children();
-                
+
 
 }
diff --git a/vitamins/sbr_rails.scad b/vitamins/sbr_rails.scad
index 0c8ddec..7ff1562 100644
--- a/vitamins/sbr_rails.scad
+++ b/vitamins/sbr_rails.scad
@@ -1,5 +1,5 @@
 //
-// NopSCADlib Copyright Chris Palmer 2020
+// NopSCADlib Copyright Chris Palmer 2023
 // nop.head@gmail.com
 // hydraraptor.blogspot.com
 //