diff --git a/scripts/external-tests.pd b/scripts/external-tests.pd
index 07ea528f8f36a5d44c4cf2342743686bb0569050..3f113fae4938c74e18744dc7b3f0b3fde1ff5841 100644
--- a/scripts/external-tests.pd
+++ b/scripts/external-tests.pd
@@ -1,4 +1,4 @@
-#N canvas 1 25 659 646 12;
+#N canvas 4 53 659 639 12;
 #X obj 61 34 loadbang;
 #N canvas 107 123 756 233 load_hcs/folder_list 0;
 #X obj 357 47 inlet;
@@ -354,7 +354,7 @@ works.;
 #X connect 28 1 19 1;
 #X connect 29 0 19 0;
 #X restore 132 543 pd get-creator-names;
-#N canvas 238 135 450 346 test-object 0;
+#N canvas 239 157 450 346 test-object 0;
 #X obj 26 36 inlet;
 #X text 72 34 creator_name argtype1 argtype2 etc.;
 #N canvas 372 37 649 659 right_outlet_for_aliases 0;
@@ -693,17 +693,19 @@ nameclash is in the current library we're testing then we ignore it.
 #X connect 23 0 24 1;
 #X connect 24 0 22 0;
 #X restore 194 114 pd check_for_namespace_collisions;
-#X obj 26 61 t a a;
-#X obj 58 114 print testing;
-#X obj 58 89 list split 1;
-#X connect 0 0 8 0;
+#X obj 49 128 print testing;
+#X obj 49 103 list split 1;
+#X obj 26 61 t a a b;
+#X obj 96 69 s \$0-object-test;
+#X connect 0 0 10 0;
 #X connect 2 0 7 0;
 #X connect 2 1 7 0;
 #X connect 3 0 5 0;
 #X connect 5 0 6 0;
-#X connect 8 0 3 0;
-#X connect 8 1 10 0;
-#X connect 10 0 9 0;
+#X connect 9 0 8 0;
+#X connect 10 0 3 0;
+#X connect 10 1 9 0;
+#X connect 10 2 11 0;
 #X restore 132 574 pd test-object;
 #X obj 164 239 trigger bang anything anything;
 #X msg 371 263 methods;
@@ -745,7 +747,7 @@ nameclash is in the current library we're testing then we ignore it.
 #X connect 1 0 2 0;
 #X connect 1 1 3 0;
 #X restore 164 329 pd set_\$0-ext;
-#N canvas 259 121 571 514 results 0;
+#N canvas 243 98 571 514 results 0;
 #X obj 62 25 inlet;
 #X obj 235 33 r \$0-current-libdir-name;
 #X obj 146 33 r \$0-fail;
@@ -761,23 +763,32 @@ nameclash is in the current library we're testing then we ignore it.
 #X msg 94 327 gui;
 #X obj 94 352 pdinfo;
 #X obj 62 384 list prepend;
-#X msg 180 389 all tests succeeded!;
-#X obj 180 414 print info;
+#X msg 180 419 all tests succeeded!;
+#X obj 180 444 print info;
 #X obj 180 324 sel 0 1;
-#X msg 343 389 1 test failed;
-#X msg 356 359 \$1 tests failed;
+#X msg 343 419 1 test failed;
+#X msg 356 389 \$1 tests failed;
 #X obj 62 410 route 0;
 #X obj 62 435 != 0;
 #X obj 62 485 s pd;
 #X msg 62 460 quit \$1;
-#X obj 343 414 print error;
+#X obj 343 444 print error;
 #X obj 146 112 list prepend add;
 #X obj 146 137 list trim;
 #X obj 146 162 textfile;
-#X obj 62 283 t a b a b;
 #X obj 79 60 t b b;
 #X msg 22 123 rewind;
 #X obj 22 83 until;
+#X obj 62 283 t a b a b b;
+#X obj 335 194 bang;
+#X obj 335 237 f;
+#X obj 414 157 f;
+#X obj 414 182 + 1;
+#X obj 414 125 r \$0-object-test;
+#X obj 402 292 print total_objects_tested;
+#X obj 335 262 moses 2407;
+#X msg 335 320 didn't count 2407 objects;
+#X obj 335 345 s \$0-fail;
 #X connect 0 0 11 0;
 #X connect 1 0 4 0;
 #X connect 2 0 3 0;
@@ -789,7 +800,7 @@ nameclash is in the current library we're testing then we ignore it.
 #X connect 9 0 8 1;
 #X connect 9 0 10 0;
 #X connect 9 0 11 1;
-#X connect 11 0 28 0;
+#X connect 11 0 31 0;
 #X connect 12 0 13 0;
 #X connect 13 0 14 1;
 #X connect 14 0 20 0;
@@ -805,15 +816,25 @@ nameclash is in the current library we're testing then we ignore it.
 #X connect 25 0 26 0;
 #X connect 26 0 27 0;
 #X connect 27 0 5 0;
-#X connect 27 1 31 1;
-#X connect 28 0 14 0;
-#X connect 28 1 12 0;
-#X connect 28 2 17 0;
-#X connect 28 3 29 0;
-#X connect 29 0 31 0;
-#X connect 29 1 30 0;
+#X connect 27 1 30 1;
+#X connect 28 0 30 0;
+#X connect 28 1 29 0;
+#X connect 29 0 27 0;
 #X connect 30 0 27 0;
-#X connect 31 0 27 0;
+#X connect 31 0 14 0;
+#X connect 31 1 12 0;
+#X connect 31 2 17 0;
+#X connect 31 3 28 0;
+#X connect 31 4 32 0;
+#X connect 32 0 33 0;
+#X connect 33 0 38 0;
+#X connect 34 0 35 0;
+#X connect 35 0 34 1;
+#X connect 35 0 33 1;
+#X connect 36 0 34 0;
+#X connect 38 0 39 0;
+#X connect 38 1 37 0;
+#X connect 39 0 40 0;
 #X restore 61 601 pd results;
 #X obj 132 209 t a a;
 #X obj 61 94 trigger bang bang bang anything;