diff --git a/test_regress/t/t_clk_2in.cpp b/test_regress/t/t_clk_2in.cpp
index fc5a0233f..a314d43a6 100644
--- a/test_regress/t/t_clk_2in.cpp
+++ b/test_regress/t/t_clk_2in.cpp
@@ -29,13 +29,14 @@ void clockit(int clk1, int clk0) {
 }
 
 int main(int argc, char* argv[]) {
+    Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
     topp = new VM_PREFIX;
     topp->check = 0;
     clockit(0, 0);
     main_time += 10;
 
-    Verilated::debug(0);
-
     for (int i = 0; i < 2; i++) {
         clockit(0, 0);
         clockit(0, 1);
diff --git a/test_regress/t/t_comb_input_0.cpp b/test_regress/t/t_comb_input_0.cpp
index 926562092..068210940 100644
--- a/test_regress/t/t_comb_input_0.cpp
+++ b/test_regress/t/t_comb_input_0.cpp
@@ -18,8 +18,8 @@
 
 int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     srand48(5);
 
     const std::unique_ptr<Vt_comb_input_0> topp{new Vt_comb_input_0};
diff --git a/test_regress/t/t_comb_input_1.cpp b/test_regress/t/t_comb_input_1.cpp
index 0277f3ca1..b97948dad 100644
--- a/test_regress/t/t_comb_input_1.cpp
+++ b/test_regress/t/t_comb_input_1.cpp
@@ -18,8 +18,8 @@
 
 int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     srand48(5);
 
     const std::unique_ptr<Vt_comb_input_1> topp{new Vt_comb_input_1};
diff --git a/test_regress/t/t_comb_input_2.cpp b/test_regress/t/t_comb_input_2.cpp
index 527cfae3d..9d2aad472 100644
--- a/test_regress/t/t_comb_input_2.cpp
+++ b/test_regress/t/t_comb_input_2.cpp
@@ -18,8 +18,8 @@
 
 int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     srand48(5);
 
     const std::unique_ptr<Vt_comb_input_2> topp{new Vt_comb_input_2};
diff --git a/test_regress/t/t_dpi_export_context2_bad.cpp b/test_regress/t/t_dpi_export_context2_bad.cpp
index ec2b10216..4c4eeb82a 100644
--- a/test_regress/t/t_dpi_export_context2_bad.cpp
+++ b/test_regress/t/t_dpi_export_context2_bad.cpp
@@ -22,9 +22,10 @@ double sc_time_stamp() { return main_time; }
 VM_PREFIX* topp = nullptr;
 
 int main(int argc, char* argv[]) {
-    topp = new VM_PREFIX;
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    topp = new VM_PREFIX;
 
     topp->eval();
     VL_DO_DANGLING(delete topp, topp);
diff --git a/test_regress/t/t_dpi_export_context_bad.cpp b/test_regress/t/t_dpi_export_context_bad.cpp
index 407c8b5b4..27a58730a 100644
--- a/test_regress/t/t_dpi_export_context_bad.cpp
+++ b/test_regress/t/t_dpi_export_context_bad.cpp
@@ -38,9 +38,10 @@ double sc_time_stamp() { return main_time; }
 VM_PREFIX* topp = nullptr;
 
 int main(int argc, char* argv[]) {
-    topp = new VM_PREFIX;
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    topp = new VM_PREFIX;
 
     topp->eval();
     dpix_task();  // Missing svSetScope
diff --git a/test_regress/t/t_dpi_export_scope_bad.cpp b/test_regress/t/t_dpi_export_scope_bad.cpp
index 0a19d5add..e6a04e849 100644
--- a/test_regress/t/t_dpi_export_scope_bad.cpp
+++ b/test_regress/t/t_dpi_export_scope_bad.cpp
@@ -28,9 +28,10 @@ double sc_time_stamp() { return main_time; }
 VM_PREFIX* topp = nullptr;
 
 int main(int argc, char* argv[]) {
-    topp = new VM_PREFIX;
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    topp = new VM_PREFIX;
 
     topp->eval();
 
diff --git a/test_regress/t/t_dpi_vams.cpp b/test_regress/t/t_dpi_vams.cpp
index 13ee8b82b..3eed4f0ed 100644
--- a/test_regress/t/t_dpi_vams.cpp
+++ b/test_regress/t/t_dpi_vams.cpp
@@ -40,9 +40,10 @@ double sc_time_stamp() { return main_time; }
 VM_PREFIX* topp = nullptr;
 
 int main(int argc, char* argv[]) {
-    topp = new VM_PREFIX;
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    topp = new VM_PREFIX;
 
     topp->in = 1.1;
     topp->eval();
diff --git a/test_regress/t/t_dpi_var.cpp b/test_regress/t/t_dpi_var.cpp
index d494db7f3..eac0571fe 100644
--- a/test_regress/t/t_dpi_var.cpp
+++ b/test_regress/t/t_dpi_var.cpp
@@ -114,8 +114,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
     uint64_t sim_time = 1100;
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
 
     const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX{contextp.get(),
                                                         // Note null name - we're flattening it out
diff --git a/test_regress/t/t_enum_public.cpp b/test_regress/t/t_enum_public.cpp
index 2ff06eea5..7bd7c99d5 100644
--- a/test_regress/t/t_enum_public.cpp
+++ b/test_regress/t/t_enum_public.cpp
@@ -15,9 +15,10 @@
 double sc_time_stamp() { return 0; }
 
 int main(int argc, char* argv[]) {
-    Vt_enum_public* topp = new Vt_enum_public;
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    Vt_enum_public* topp = new Vt_enum_public;
 
     // Make sure public tag worked
     if (Vt_enum_public_p3::ZERO == Vt_enum_public_p3::ONE) {}
diff --git a/test_regress/t/t_flag_fi.cpp b/test_regress/t/t_flag_fi.cpp
index 176c434b7..e510f4cee 100644
--- a/test_regress/t/t_flag_fi.cpp
+++ b/test_regress/t/t_flag_fi.cpp
@@ -22,9 +22,10 @@ bool gotit = false;
 void myfunction() { gotit = true; }
 
 int main(int argc, char* argv[]) {
-    topp = new VM_PREFIX;
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    topp = new VM_PREFIX;
 
     topp->eval();
     if (!gotit) vl_fatal(__FILE__, __LINE__, "dut", "Never got call to myfunction");
diff --git a/test_regress/t/t_forceable_net.cpp b/test_regress/t/t_forceable_net.cpp
index 278020f0b..7830e52f0 100644
--- a/test_regress/t/t_forceable_net.cpp
+++ b/test_regress/t/t_forceable_net.cpp
@@ -18,8 +18,8 @@
 
 int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     srand48(5);
 
     const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX{"top"}};
diff --git a/test_regress/t/t_forceable_var.cpp b/test_regress/t/t_forceable_var.cpp
index 9286d3606..f95b1c27c 100644
--- a/test_regress/t/t_forceable_var.cpp
+++ b/test_regress/t/t_forceable_var.cpp
@@ -18,8 +18,8 @@
 
 int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     srand48(5);
 
     const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX{"top"}};
diff --git a/test_regress/t/t_func_rand.cpp b/test_regress/t/t_func_rand.cpp
index d2be39ab9..fdfaba95e 100644
--- a/test_regress/t/t_func_rand.cpp
+++ b/test_regress/t/t_func_rand.cpp
@@ -13,9 +13,10 @@
 double sc_time_stamp() { return 0; }
 
 int main(int argc, char* argv[]) {
-    Vt_func_rand* topp = new Vt_func_rand;
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    Vt_func_rand* topp = new Vt_func_rand;
 
     printf("\nTesting\n");
     for (int i = 0; i < 10; i++) {
diff --git a/test_regress/t/t_gantt_two.cpp b/test_regress/t/t_gantt_two.cpp
index 04b412836..7b1375126 100644
--- a/test_regress/t/t_gantt_two.cpp
+++ b/test_regress/t/t_gantt_two.cpp
@@ -18,8 +18,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
     // VL_USE_THREADS define is set in t_gantt_two.pl
     contextp->threads(TEST_USE_THREADS);
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
 
     std::unique_ptr<Vt_gantt_two> topap{new Vt_gantt_two{contextp.get(), "topa"}};
     std::unique_ptr<Vt_gantt_two> topbp{new Vt_gantt_two{contextp.get(), "topb"}};
diff --git a/test_regress/t/t_leak.cpp b/test_regress/t/t_leak.cpp
index decf48891..eb15c060f 100644
--- a/test_regress/t/t_leak.cpp
+++ b/test_regress/t/t_leak.cpp
@@ -48,11 +48,11 @@ long long get_memory_usage() {
 void make_and_destroy() {
 #ifdef VL_NO_LEGACY
     VerilatedContext* contextp = new VerilatedContext;
-    VM_PREFIX* topp = new VM_PREFIX{contextp};
     contextp->debug(0);
+    VM_PREFIX* topp = new VM_PREFIX{contextp};
 #else
-    VM_PREFIX* topp = new VM_PREFIX;
     Verilated::debug(0);
+    VM_PREFIX* topp = new VM_PREFIX;
 #endif
 
     topp->eval();
diff --git a/test_regress/t/t_math_imm2.cpp b/test_regress/t/t_math_imm2.cpp
index 54c1657e5..b4c8015a0 100644
--- a/test_regress/t/t_math_imm2.cpp
+++ b/test_regress/t/t_math_imm2.cpp
@@ -17,6 +17,7 @@ QData MaskVal(int lbit, int hbit) {
 
 int main(int argc, char* argv[]) {
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
 
     Vt_math_imm2* sim = new Vt_math_imm2;
     int lbit, hbit;
diff --git a/test_regress/t/t_mem_slot.cpp b/test_regress/t/t_mem_slot.cpp
index 5c32d9ec8..a65ae687d 100644
--- a/test_regress/t/t_mem_slot.cpp
+++ b/test_regress/t/t_mem_slot.cpp
@@ -45,11 +45,12 @@ unsigned int StepSim(Vt_mem_slot* sim, unsigned int slot, unsigned int bit, unsi
 }
 
 int main(int argc, char* argv[]) {
+    Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
     Vt_mem_slot* sim = new Vt_mem_slot;
     int slot, bit, i;
 
-    Verilated::debug(0);
-
     // clear all bits in the array
     for (slot = 0; slot < 3; slot++)
         for (bit = 0; bit < 2; bit++)  //
diff --git a/test_regress/t/t_multitop_sig.cpp b/test_regress/t/t_multitop_sig.cpp
index 0ce924bf8..29a01491b 100644
--- a/test_regress/t/t_multitop_sig.cpp
+++ b/test_regress/t/t_multitop_sig.cpp
@@ -20,9 +20,10 @@ double sc_time_stamp() { return 0; }
 int errors = 0;
 
 int main(int argc, char* argv[]) {
-    Vt_multitop_sig* topp = new Vt_multitop_sig{""};
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    Vt_multitop_sig* topp = new Vt_multitop_sig{""};
 
     {
         topp->a__02Ein = 0;
diff --git a/test_regress/t/t_order_quad.cpp b/test_regress/t/t_order_quad.cpp
index 95eddc4fa..cf6c247f3 100644
--- a/test_regress/t/t_order_quad.cpp
+++ b/test_regress/t/t_order_quad.cpp
@@ -27,9 +27,10 @@ void check(QData got, QData exp) {
 }
 
 int main(int argc, char* argv[]) {
-    topp = new VM_PREFIX;
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    topp = new VM_PREFIX;
 
     topp->a0 = 0;
     topp->eval();
diff --git a/test_regress/t/t_param_public.cpp b/test_regress/t/t_param_public.cpp
index 66bfd20cf..17cc1c0f6 100644
--- a/test_regress/t/t_param_public.cpp
+++ b/test_regress/t/t_param_public.cpp
@@ -15,9 +15,10 @@
 double sc_time_stamp() { return 0; }
 
 int main(int argc, char* argv[]) {
-    Vt_param_public* topp = new Vt_param_public;
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    Vt_param_public* topp = new Vt_param_public;
 
     // Make sure public tag worked
     if (static_cast<int>(Vt_param_public_t::TOP_PARAM) != 30) {
diff --git a/test_regress/t/t_public_clk.cpp b/test_regress/t/t_public_clk.cpp
index ebed647f7..7d27a83c8 100644
--- a/test_regress/t/t_public_clk.cpp
+++ b/test_regress/t/t_public_clk.cpp
@@ -16,8 +16,8 @@ std::unique_ptr<Vt_public_clk> topp;
 int main(int argc, char** argv) {
     vluint64_t sim_time = 1100;
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     srand48(5);
     topp.reset(new Vt_public_clk("top"));
 
diff --git a/test_regress/t/t_public_seq.cpp b/test_regress/t/t_public_seq.cpp
index f69b3ab8d..3299aba0c 100644
--- a/test_regress/t/t_public_seq.cpp
+++ b/test_regress/t/t_public_seq.cpp
@@ -16,8 +16,8 @@ std::unique_ptr<Vt_public_seq> topp;
 int main(int argc, char** argv) {
     vluint64_t sim_time = 1100;
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     srand48(5);
     topp.reset(new Vt_public_seq("top"));
 
diff --git a/test_regress/t/t_savable_open_bad2.cpp b/test_regress/t/t_savable_open_bad2.cpp
index c3a278118..8086da829 100644
--- a/test_regress/t/t_savable_open_bad2.cpp
+++ b/test_regress/t/t_savable_open_bad2.cpp
@@ -23,9 +23,10 @@ int errors = 0;
 double sc_time_stamp() { return main_time; }
 
 int main(int argc, char* argv[]) {
-    // No need to make a model:  topp = new VM_PREFIX;
-
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
+
+    // No need to make a model:  topp = new VM_PREFIX;
     {
         VerilatedSave os;
         os.open("/No/such_file_as_this");
diff --git a/test_regress/t/t_trace_cat.cpp b/test_regress/t/t_trace_cat.cpp
index bc5cc83bc..488eb4187 100644
--- a/test_regress/t/t_trace_cat.cpp
+++ b/test_regress/t/t_trace_cat.cpp
@@ -23,10 +23,11 @@ const char* trace_name() {
 }
 
 int main(int argc, char** argv) {
-    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
-
     Verilated::debug(0);
     Verilated::traceEverOn(true);
+    Verilated::commandArgs(argc, argv);
+
+    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
 
     std::unique_ptr<VerilatedVcdC> tfp{new VerilatedVcdC};
     top->trace(tfp.get(), 99);
diff --git a/test_regress/t/t_trace_cat_fst.cpp b/test_regress/t/t_trace_cat_fst.cpp
index d541834a1..af8e3cdf3 100644
--- a/test_regress/t/t_trace_cat_fst.cpp
+++ b/test_regress/t/t_trace_cat_fst.cpp
@@ -23,10 +23,11 @@ const char* trace_name() {
 }
 
 int main(int argc, char** argv) {
-    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
-
     Verilated::debug(0);
     Verilated::traceEverOn(true);
+    Verilated::commandArgs(argc, argv);
+
+    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
 
     std::unique_ptr<VerilatedFstC> tfp{new VerilatedFstC};
     top->trace(tfp.get(), 99);
diff --git a/test_regress/t/t_trace_dumpvars_dyn.cpp b/test_regress/t/t_trace_dumpvars_dyn.cpp
index 57f8c50ca..f143e04ba 100644
--- a/test_regress/t/t_trace_dumpvars_dyn.cpp
+++ b/test_regress/t/t_trace_dumpvars_dyn.cpp
@@ -20,10 +20,11 @@ double sc_time_stamp() { return (double)main_time; }
 const unsigned long long dt_2 = 3;
 
 int main(int argc, char** argv) {
-    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
-
     Verilated::debug(0);
     Verilated::traceEverOn(true);
+    Verilated::commandArgs(argc, argv);
+
+    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
 
 #if defined(T_TRACE_DUMPVARS_DYN_VCD_0) || defined(T_TRACE_DUMPVARS_DYN_VCD_1)
     std::unique_ptr<VerilatedVcdC> tfp{new VerilatedVcdC};
diff --git a/test_regress/t/t_trace_public_func.cpp b/test_regress/t/t_trace_public_func.cpp
index cd65cf622..6cd30c21f 100644
--- a/test_regress/t/t_trace_public_func.cpp
+++ b/test_regress/t/t_trace_public_func.cpp
@@ -28,10 +28,11 @@ double sc_time_stamp() { return (double)main_time; }
 const unsigned long long dt_2 = 3;
 
 int main(int argc, char** argv) {
-    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
-
     Verilated::debug(0);
     Verilated::traceEverOn(true);
+    Verilated::commandArgs(argc, argv);
+
+    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
 
     std::unique_ptr<VerilatedVcdC> tfp{new VerilatedVcdC};
     top->trace(tfp.get(), 99);
diff --git a/test_regress/t/t_trace_public_sig.cpp b/test_regress/t/t_trace_public_sig.cpp
index 7295bd20c..c694a85cc 100644
--- a/test_regress/t/t_trace_public_sig.cpp
+++ b/test_regress/t/t_trace_public_sig.cpp
@@ -26,10 +26,11 @@ double sc_time_stamp() { return (double)main_time; }
 const unsigned long long dt_2 = 3;
 
 int main(int argc, char** argv) {
-    VM_PREFIX* top = new VM_PREFIX{"top"};
-
     Verilated::debug(0);
     Verilated::traceEverOn(true);
+    Verilated::commandArgs(argc, argv);
+
+    VM_PREFIX* top = new VM_PREFIX{"top"};
 
     VerilatedVcdC* tfp = new VerilatedVcdC;
     top->trace(tfp, 99);
diff --git a/test_regress/t/t_trace_rollover.cpp b/test_regress/t/t_trace_rollover.cpp
index b9f72042b..b07466a29 100644
--- a/test_regress/t/t_trace_rollover.cpp
+++ b/test_regress/t/t_trace_rollover.cpp
@@ -17,10 +17,11 @@ unsigned long long main_time = 0;
 double sc_time_stamp() { return (double)main_time; }
 
 int main(int argc, char** argv) {
-    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
-
     Verilated::debug(0);
     Verilated::traceEverOn(true);
+    Verilated::commandArgs(argc, argv);
+
+    std::unique_ptr<VM_PREFIX> top{new VM_PREFIX("top")};
 
     std::unique_ptr<VerilatedVcdC> tfp{new VerilatedVcdC};
     top->trace(tfp.get(), 99);
diff --git a/test_regress/t/t_trace_two_cc.cpp b/test_regress/t/t_trace_two_cc.cpp
index 9b4378a40..92d9d33f9 100644
--- a/test_regress/t/t_trace_two_cc.cpp
+++ b/test_regress/t/t_trace_two_cc.cpp
@@ -30,8 +30,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
     uint64_t sim_time = 1100;
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     contextp->traceEverOn(true);
     srand48(5);
     ap = new VM_PREFIX{contextp.get(), "topa"};
diff --git a/test_regress/t/t_trace_two_sc.cpp b/test_regress/t/t_trace_two_sc.cpp
index 99f111fe4..c1ba67b28 100644
--- a/test_regress/t/t_trace_two_sc.cpp
+++ b/test_regress/t/t_trace_two_sc.cpp
@@ -28,11 +28,12 @@ VM_PREFIX* ap;
 Vt_trace_two_b* bp;
 
 int sc_main(int argc, char** argv) {
+    Verilated::debug(0);
+    Verilated::traceEverOn(true);
+    Verilated::commandArgs(argc, argv);
+
     sc_signal<bool> clk;
     sc_time sim_time(1100, SC_NS);
-    Verilated::commandArgs(argc, argv);
-    Verilated::traceEverOn(true);
-    Verilated::debug(0);
     srand48(5);
     ap = new VM_PREFIX{"topa"};
     bp = new Vt_trace_two_b{"topb"};
diff --git a/test_regress/t/t_tri_gate.cpp b/test_regress/t/t_tri_gate.cpp
index 3981e94b7..5996914aa 100644
--- a/test_regress/t/t_tri_gate.cpp
+++ b/test_regress/t/t_tri_gate.cpp
@@ -33,12 +33,11 @@ bool check() {
 }
 
 int main() {
-    bool pass = true;
-
     Verilated::debug(0);
     tb = new VM_PREFIX{"tb"};
 
     // loop through every possibility and check the result
+    bool pass = true;
     for (tb->SEL = 0; tb->SEL < 2; tb->SEL++) {
         for (tb->A = 0; tb->A < 4; tb->A++) {
             tb->eval();
diff --git a/test_regress/t/t_tri_pullup.cpp b/test_regress/t/t_tri_pullup.cpp
index 29aa72a9e..84fc351d1 100644
--- a/test_regress/t/t_tri_pullup.cpp
+++ b/test_regress/t/t_tri_pullup.cpp
@@ -44,12 +44,12 @@ bool check() {
 }
 
 int main() {
-    bool pass = true;
-
     Verilated::debug(0);
+
     tb = new Vt_tri_pullup{"tb"};
 
     // loop through every possibility and check the result
+    bool pass = true;
     for (tb->OE = 0; tb->OE < 2; tb->OE++) {
         for (tb->A = 0; tb->A < 2; tb->A++) {
             tb->eval();
diff --git a/test_regress/t/t_tri_select.cpp b/test_regress/t/t_tri_select.cpp
index a4c6ee54a..ff31b307d 100644
--- a/test_regress/t/t_tri_select.cpp
+++ b/test_regress/t/t_tri_select.cpp
@@ -42,12 +42,12 @@ bool check() {
 }
 
 int main() {
-    bool pass = true;
-
     Verilated::debug(0);
+
     tb = new Vt_tri_select{"tb"};
 
     // loop through every possibility and check the result
+    bool pass = true;
     for (tb->OE1 = 0; tb->OE1 < 2; tb->OE1++) {
         for (tb->OE2 = 0; tb->OE2 < 2; tb->OE2++) {
             for (tb->A1 = 0; tb->A1 < 4; tb->A1++) {
diff --git a/test_regress/t/t_var_overwidth_bad.cpp b/test_regress/t/t_var_overwidth_bad.cpp
index e0f45a1b0..5a4158ca8 100644
--- a/test_regress/t/t_var_overwidth_bad.cpp
+++ b/test_regress/t/t_var_overwidth_bad.cpp
@@ -21,6 +21,7 @@ double sc_time_stamp() { return main_time; }
 
 int main(int argc, char** argv) {
     Verilated::debug(0);
+    Verilated::commandArgs(argc, argv);
 
     VM_PREFIX* topp = new VM_PREFIX{""};  // Note null name - we're flattening it out
 
diff --git a/test_regress/t/t_vpi_cb_iter.cpp b/test_regress/t/t_vpi_cb_iter.cpp
index 295b95e4d..d7b4d932e 100644
--- a/test_regress/t/t_vpi_cb_iter.cpp
+++ b/test_regress/t/t_vpi_cb_iter.cpp
@@ -147,8 +147,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
     uint64_t sim_time = 100;
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
 
     const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX{contextp.get(),
                                                         // Note null name - we're flattening it out
diff --git a/test_regress/t/t_vpi_get.cpp b/test_regress/t/t_vpi_get.cpp
index 6d28d1d76..132d2f39d 100644
--- a/test_regress/t/t_vpi_get.cpp
+++ b/test_regress/t/t_vpi_get.cpp
@@ -243,8 +243,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
     uint64_t sim_time = 1100;
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
 
     const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX{contextp.get(),
                                                         // Note null name - we're flattening it out
diff --git a/test_regress/t/t_vpi_memory.cpp b/test_regress/t/t_vpi_memory.cpp
index 63562b2f2..09ff0af06 100644
--- a/test_regress/t/t_vpi_memory.cpp
+++ b/test_regress/t/t_vpi_memory.cpp
@@ -254,8 +254,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
     uint64_t sim_time = 1100;
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     // we're going to be checking for these errors do don't crash out
     contextp->fatalOnVpiError(0);
 
diff --git a/test_regress/t/t_vpi_module.cpp b/test_regress/t/t_vpi_module.cpp
index 14ba4236f..650c7f55f 100644
--- a/test_regress/t/t_vpi_module.cpp
+++ b/test_regress/t/t_vpi_module.cpp
@@ -175,8 +175,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
     uint64_t sim_time = 1100;
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     // we're going to be checking for these errors do don't crash out
     contextp->fatalOnVpiError(0);
 
diff --git a/test_regress/t/t_vpi_param.cpp b/test_regress/t/t_vpi_param.cpp
index 46b7cad4c..12feae1fd 100644
--- a/test_regress/t/t_vpi_param.cpp
+++ b/test_regress/t/t_vpi_param.cpp
@@ -243,8 +243,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
     uint64_t sim_time = 1100;
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
     // we're going to be checking for these errors do don't crash out
     contextp->fatalOnVpiError(0);
 
diff --git a/test_regress/t/t_vpi_time_cb.cpp b/test_regress/t/t_vpi_time_cb.cpp
index d41fddc30..b26a1fb1f 100644
--- a/test_regress/t/t_vpi_time_cb.cpp
+++ b/test_regress/t/t_vpi_time_cb.cpp
@@ -28,8 +28,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
     uint64_t sim_time = 1100;
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
 
     const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX{contextp.get(),
                                                         // Note null name - we're flattening it out
diff --git a/test_regress/t/t_vpi_var.cpp b/test_regress/t/t_vpi_var.cpp
index 5d94e9567..5f28eb0d5 100644
--- a/test_regress/t/t_vpi_var.cpp
+++ b/test_regress/t/t_vpi_var.cpp
@@ -697,8 +697,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
     uint64_t sim_time = 1100;
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
 
     const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX{contextp.get(),
                                                         // Note null name - we're flattening it out
diff --git a/test_regress/t/t_vpi_zero_time_cb.cpp b/test_regress/t/t_vpi_zero_time_cb.cpp
index b5c74feb5..e94e11164 100644
--- a/test_regress/t/t_vpi_zero_time_cb.cpp
+++ b/test_regress/t/t_vpi_zero_time_cb.cpp
@@ -109,8 +109,8 @@ int main(int argc, char** argv) {
     const std::unique_ptr<VerilatedContext> contextp{new VerilatedContext};
 
     uint64_t sim_time = 1100;
-    contextp->commandArgs(argc, argv);
     contextp->debug(0);
+    contextp->commandArgs(argc, argv);
 
     const std::unique_ptr<VM_PREFIX> topp{new VM_PREFIX{contextp.get(),
                                                         // Note null name - we're flattening it out