diff --git a/magma/simulator/python_simulator.py b/magma/simulator/python_simulator.py
index 286629fdfe..84bb7619f3 100644
--- a/magma/simulator/python_simulator.py
+++ b/magma/simulator/python_simulator.py
@@ -384,62 +384,3 @@ def __call__(self, *largs):
         if len(outs) == 1:
             return outs[0]
         return tuple(outs)
-
-
-def testvectors(circuit, input_ranges=None, mode='complete'):
-    ntest = len(circuit.interface.ports.items())
-
-    simulator = PythonSimulator(circuit)
-
-    args = []
-    for i, (name, port) in enumerate(circuit.interface.ports.items()):
-        if port.isoutput():
-            if isinstance(port, BitType):
-                args.append([BitVector(0),BitVector(1)])
-            elif isinstance(port, ArrayType):
-                num_bits = type(port).N
-                if isinstance(port, SIntType):
-                    if input_ranges is None:
-                        start = -2**(num_bits - 1)
-                        end = 2**(num_bits - 1)  # We don't subtract one because range end is exclusive
-                        input_range = range(start, end)
-                    else:
-                        input_range = input_ranges[i]
-                    args.append([BitVector(x, num_bits=num_bits, signed=True) for x in input_range])
-                else:
-                    if input_ranges is None:
-                        input_range = range(1<<num_bits)
-                    else:
-                        input_range = input_ranges[i]
-                    args.append([BitVector(x, num_bits=num_bits) for x in input_range])
-            else:
-                assert True, "can't test Tuples"
-
-    tests = []
-    for test in product(*args):
-        test = list(test)
-        testv = ntest*[0]
-        j = 0
-        for i, (name, port) in enumerate(circuit.interface.ports.items()):
-            # circuit defn output is an input to the idefinition
-            if port.isoutput():
-                testv[i] = test[j].as_int()
-                val = test[j].as_bool_list()
-                if len(val) == 1: val = val[0]
-                simulator.set_value(getattr(circuit, name), val)
-                j += 1
-
-        simulator.evaluate()
-
-        for i, (name, port) in enumerate(circuit.interface.ports.items()):
-            # circuit defn input is an input of the definition
-            if port.isinput():
-                val = simulator.get_value(getattr(circuit, name))
-                val = int(val) if isinstance(val, bool) else seq2int(val)
-                testv[i] = val
-
-
-        tests.append(testv)
-
-    return tests
-
diff --git a/magma/testing/function.py b/magma/testing/function.py
deleted file mode 100644
index 2ffe86a6c8..0000000000
--- a/magma/testing/function.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from magma import BitType, ArrayType, SIntType
-from bit_vector import BitVector
-import sys
-if sys.version_info < (3, 3):
-    from funcsigs import signature
-else:
-    from inspect import signature
-from itertools import product
-import pytest
-
-# check that number of function arguments equals number of circuit inputs
-def check(circuit, func):
-    sig = signature(func)
-    nfuncargs = len(sig.parameters)
-
-    # count circuit inputs
-    ncircargs = 0
-    for name, port in circuit.interface.ports.items():
-        if port.isoutput():
-            ncircargs += 1
-    assert nfuncargs == ncircargs
-
-@pytest.mark.skip(reason="Not a test")
-def testvectors(circuit, func, input_ranges=None, mode='complete'):
-    # Remove check for now, since user could implement using *args
-    # TODO: check *args and let that pass, otherwise verify they are the same
-    # check(circuit, func)
-
-    args = []
-    for i, (name, port) in enumerate(circuit.interface.ports.items()):
-        if port.isoutput():
-            if isinstance(port, BitType):
-                args.append([BitVector(0),BitVector(1)])
-            elif isinstance(port, ArrayType):
-                num_bits = type(port).N
-                print(port)
-                if isinstance(port, SIntType):
-                    if input_ranges is None:
-                        start = -2**(num_bits - 1)
-                        end = 2**(num_bits - 1)  # We don't subtract one because range end is exclusive
-                        input_range = range(start, end)
-                        print(input_range)
-                    else:
-                        input_range = input_ranges[i]
-                    args.append([BitVector(x, num_bits=num_bits, signed=True) for x in input_range])
-                else:
-                    if input_ranges is None:
-                        input_range = range(1<<num_bits)
-                    else:
-                        input_range = input_ranges[i]
-                    args.append([BitVector(x, num_bits=num_bits) for x in input_range])
-            else:
-                assert True, "can't test Tuples"
-
-    nargs = len(args)
-    tests = []
-    for test in product(*args):
-        test = list(test)
-        result = func(*test)
-        if isinstance(result, tuple):
-            test.extend(result)
-        else:
-            test.append(result)
-        tests.append(test)
-
-    return tests
diff --git a/magma/testing/newfunction.py b/magma/testing/newfunction.py
deleted file mode 100644
index 69b9a9bcb2..0000000000
--- a/magma/testing/newfunction.py
+++ /dev/null
@@ -1,61 +0,0 @@
-from magma import BitType, ArrayType, SIntType
-from magma.bit_vector import BitVector
-import sys
-if sys.version_info < (3, 3):
-    from funcsigs import signature
-else:
-    from inspect import signature
-from itertools import product
-import pytest
-
-# check that number of function arguments equals number of circuit inputs
-def check(circuit, func):
-    sig = signature(func)
-    nfuncargs = len(sig.parameters)
-
-    # count circuit inputs
-    ncircargs = 0
-    for name, port in circuit.interface.ports.items():
-        if port.isoutput():
-            ncircargs += 1
-
-    assert nfuncargs == ncircargs
-
-@pytest.mark.skip(reason="Not a test")
-def testvectors(circuit, func, input_ranges=None, mode='complete'):
-    check(circuit, func)
-
-    args = []
-    for i, (name, port) in enumerate(circuit.interface.ports.items()):
-        if port.isoutput():
-            if isinstance(port, BitType):
-                args.append([0,1])
-            elif isinstance(port, ArrayType):
-                num_bits = type(port).N
-                if isinstance(port, SIntType):
-                    if input_ranges is None:
-                        input_range = range(-2**(num_bits-1), 2**(num_bits-1))
-                    else:
-                        input_range = input_ranges[i]
-                else:
-                    if input_ranges is None:
-                        input_range = range(1<<num_bits)
-                    else:
-                        input_range = input_ranges[i]
-                args.append(input_range)
-            else:
-                assert True, "can't test Tuples"
-
-    nargs = len(args)
-
-    tests = []
-    for test in product(*args):
-        test = list(test)
-        result = func(*test)
-        if isinstance(result, tuple):
-            test.extend(result)
-        else:
-            test.append(result)
-        tests.append(test)
-
-    return tests