diff --git a/casper_accumulators/run.py b/casper_accumulators/run.py
index 9be7ff7a..c17f0dba 100644
--- a/casper_accumulators/run.py
+++ b/casper_accumulators/run.py
@@ -4,7 +4,8 @@
 import numpy as np
 
 # Create VUnit instance by parsing command line arguments
-vu = VUnit.from_argv()
+vu = from_argv(compile_builtins=False)
+vu.add_vhdl_builtins()
 script_dir = dirname(__file__)
 
 # XPM Library compile
diff --git a/casper_adder/run.py b/casper_adder/run.py
index 1f01145a..95c1c4a9 100644
--- a/casper_adder/run.py
+++ b/casper_adder/run.py
@@ -57,8 +57,8 @@ def generate_tests(obj, direc, add_sub, inp_pipeline, out_pipeline, in_dat_w):
                                 g_a_val_min=a_v_min, g_a_val_max=a_v_max, g_b_val_min=b_v_min, g_b_val_max=b_v_max)
             )
 
-vu = VUnit.from_argv()
-
+vu = from_argv(compile_builtins=False)
+vu.add_vhdl_builtins()
 script_dir = os.path.dirname(__file__)
 
 lib1 = vu.add_library("casper_adder_lib",allow_duplicate=True)
diff --git a/casper_counter/run.py b/casper_counter/run.py
index e00a3006..d833e337 100644
--- a/casper_counter/run.py
+++ b/casper_counter/run.py
@@ -2,7 +2,8 @@
 from os.path import dirname, join
 
 # Create VUnit instance by parsing command line arguments
-vu = VUnit.from_argv()
+vu = from_argv(compile_builtins=False)
+vu.add_vhdl_builtins()
 script_dir = dirname(__file__)
 
 # Create library 'casper_counter_lib'
diff --git a/casper_delay/run.py b/casper_delay/run.py
index e6c68aff..68b2d70f 100644
--- a/casper_delay/run.py
+++ b/casper_delay/run.py
@@ -4,7 +4,8 @@
 import numpy as np
 
 # Create VUnit instance by parsing command line arguments
-vu = VUnit.from_argv()
+vu = from_argv(compile_builtins=False)
+vu.add_vhdl_builtins()
 script_dir = dirname(__file__)
 
 # XPM Library compile
diff --git a/casper_fifo/run.py b/casper_fifo/run.py
index 69f3b502..bd7f2479 100644
--- a/casper_fifo/run.py
+++ b/casper_fifo/run.py
@@ -1,8 +1,8 @@
 import os
 from vunit import VUnit            
 
-vu = VUnit.from_argv()
-
+vu = from_argv(compile_builtins=False)
+vu.add_vhdl_builtins()
 script_dir = os.path.dirname(__file__)
 
 lib1 = vu.add_library("tb_lib",allow_duplicate=True)
diff --git a/casper_filter/run.py b/casper_filter/run.py
index 0dc64c84..f37fb743 100644
--- a/casper_filter/run.py
+++ b/casper_filter/run.py
@@ -17,8 +17,8 @@ def manglePkg(file_name, line_number, new_line):
 args = cli.parse_args()
 
 # Create VUnit instance by parsing command line arguments
-vu = VUnit.from_args(args = args)
-
+vu = VUnit.from_args(args = args,compile_builtins=False)
+vu.add_vhdl_builtins()
 # XPM Library compile
 lib_xpm = vu.add_library("xpm")
 lib_xpm.add_source_files(join(script_dir, "../xilinx/xpm_vhdl/src/xpm/xpm_VCOMP.vhd"))
diff --git a/casper_flow_control/run.py b/casper_flow_control/run.py
index 76d87ac3..d143349f 100644
--- a/casper_flow_control/run.py
+++ b/casper_flow_control/run.py
@@ -3,7 +3,8 @@
 import random
 
 # Create VUnit instance by parsing command line arguments
-vu = VUnit.from_argv()
+vu = from_argv(compile_builtins=False)
+vu.add_vhdl_builtins()
 script_dir = dirname(__file__)
 
 # Create library 'common_pkg_lib'
diff --git a/casper_multiplexer/run.py b/casper_multiplexer/run.py
index e63fff37..0ed1c543 100644
--- a/casper_multiplexer/run.py
+++ b/casper_multiplexer/run.py
@@ -44,8 +44,8 @@ def generate_tests(obj,
             g_test_nof_cycles=test_nof_cycles)
       )
 
-vu = VUnit.from_argv()
-
+vu = from_argv(compile_builtins=False)
+vu.add_vhdl_builtins()
 script_dir = os.path.dirname(__file__)
 
 lib1 = vu.add_library("casper_multiplexer_lib")
diff --git a/casper_multiplier/run.py b/casper_multiplier/run.py
index cd63b2a6..d6feba66 100644
--- a/casper_multiplier/run.py
+++ b/casper_multiplier/run.py
@@ -4,8 +4,8 @@
 import glob
 from os.path import dirname
 # Create VUnit instance by parsing command line arguments
-vu = VUnit.from_argv()
-
+vu = from_argv(compile_builtins=False)
+vu.add_vhdl_builtins()
 # Function for mult range calculations
 def get_ranges(dat_w,margin):
     min_val = -(2**(dat_w-1))
diff --git a/casper_ram/run.py b/casper_ram/run.py
index 9a8d1bec..06e666f7 100644
--- a/casper_ram/run.py
+++ b/casper_ram/run.py
@@ -2,7 +2,8 @@
 from os.path import dirname, join
 
 # Create VUnit instance by parsing command line arguments
-vu = VUnit.from_argv()
+vu = from_argv(compile_builtins=False)
+vu.add_vhdl_builtins()
 script_dir = dirname(__file__)
 
 # XPM Library compile
diff --git a/casper_wb_fft/run.py b/casper_wb_fft/run.py
index 3e7e318a..1980754f 100644
--- a/casper_wb_fft/run.py
+++ b/casper_wb_fft/run.py
@@ -98,7 +98,6 @@ def manglePkg(file_name, line_number, new_line):
 
 # Create VUnit instance by parsing command line arguments
 vu = VUnit.from_args(args = args,compile_builtins=False)
-
 # If none of the flags are specified, run all tests.
 run_all = not(args.par or args.pipe or args.wide or args.bitaccurate)
 vu.add_vhdl_builtins()
diff --git a/casper_wbpfb/run.py b/casper_wbpfb/run.py
index 95252708..b054e1a8 100644
--- a/casper_wbpfb/run.py
+++ b/casper_wbpfb/run.py
@@ -15,7 +15,7 @@ def manglePkg(file_name, line_number, new_line):
 # test_to_run = sys.argv[1]
 
 # Create VUnit instance by parsing command line arguments
-vu = VUnit.from_argv()
+vu = from_argv(compile_builtins=False)
 vu.add_vhdl_builtins()
 # XPM Library compile
 lib_xpm = vu.add_library("xpm")
diff --git a/misc/run.py b/misc/run.py
index 1524b77a..62b8be15 100644
--- a/misc/run.py
+++ b/misc/run.py
@@ -4,7 +4,7 @@
 import random
 
 # Create VUnit instance by parsing command line arguments
-vu = VUnit.from_argv()
+vu = from_argv(compile_builtins=False)
 script_dir = dirname(__file__)
 
 # Create library 'common_pkg_lib'