diff --git a/test_regress/t/t_pipe_exit_bad.pl b/test_regress/t/t_pipe_exit_bad.pl
index 1831a360b..4cbba3f9d 100755
--- a/test_regress/t/t_pipe_exit_bad.pl
+++ b/test_regress/t/t_pipe_exit_bad.pl
@@ -17,9 +17,7 @@ compile (
     stdout_filename => $stdout_filename,
     fails=>1,
     expect=>
-'%Error: t_pipe_exit_bad.pf: Intentional bad exit status...
-%Error: File not found: t/t_pipe_filter.v
-%Error: Exiting due to.*',
+'%Error: t_pipe_exit_bad.pf: Intentional bad exit status....*',
     );
 ok(1);
 
diff --git a/test_regress/t/t_tri_select.cpp b/test_regress/t/t_tri_select.cpp
index 9e7793361..30f06ae2e 100644
--- a/test_regress/t/t_tri_select.cpp
+++ b/test_regress/t/t_tri_select.cpp
@@ -16,9 +16,9 @@ bool check() {
     bool verbose = false;
 #endif
 
-    int Y = (tb->OE1 & !tb->OE2) ? tb->A1
-	: (!tb->OE1 & tb->OE2) ? tb->A2
-	: (tb->OE1 & tb->OE2) ? (tb->A1 | tb->A2)
+    int Y = ((tb->OE1) & (!tb->OE2)) ? tb->A1
+	: ((!tb->OE1) & (tb->OE2)) ? tb->A2
+	: ((tb->OE1) & (tb->OE2)) ? (tb->A1 | tb->A2)
 	: 3; // pullup
 
     int W = (((tb->OE2) ? (tb->A2 & 0x1) : 0) << tb->A1)
diff --git a/test_verilated/vgen.pl b/test_verilated/vgen.pl
index 8bdb8f9e8..68f26b59a 100755
--- a/test_verilated/vgen.pl
+++ b/test_verilated/vgen.pl
@@ -377,17 +377,15 @@ sub rnd_const {
     my $val = Bit::Vector->new($width);
     if ($v<25) {	# zero
     } elsif ($v<50) {	# ones
-	$val->Word_Store(0,~0);
-	$val->Word_Store(1,~0) if $width>32;
-	$val->Word_Store(2,~0) if $width>64;
-	$val->Word_Store(3,~0) if $width>96;
+	for (my $w=0; $w<$val->Word_Size; ++$w) {
+	    $val->Word_Store(0,~0);
+	}
     } elsif ($v<60) {	# one
 	$val->Word_Store(0,1);
     } else { #random
-	$val->Word_Store(0,rnd_int());
-	$val->Word_Store(1,rnd_int()) if $width>32;
-	$val->Word_Store(2,rnd_int()) if $width>64;
-	$val->Word_Store(3,rnd_int()) if $width>96;
+	for (my $w=0; $w<$val->Word_Size; ++$w) {
+	    $val->Word_Store($w,rnd_int());
+	}
     }
     $treeref->{val} = $val;
 }