diff --git a/Makefile b/Makefile
index 8b090422..9962e007 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,12 @@
 all:
 	$(MAKE) -C hw
 	$(MAKE) -C driver
-	$(MAKE) -C runtime
 	$(MAKE) -C simX
+	$(MAKE) -C runtime
 
 clean:
 	$(MAKE) -C hw clean
 	$(MAKE) -C driver clean
+	$(MAKE) -C simX clean
 	$(MAKE) -C runtime clean
-	$(MAKE) -C simX clean
\ No newline at end of file
+
diff --git a/benchmarks/riscv_tests/isa/Makefile b/benchmarks/riscv_tests/isa/Makefile
index 944d1875..05837666 100644
--- a/benchmarks/riscv_tests/isa/Makefile
+++ b/benchmarks/riscv_tests/isa/Makefile
@@ -1,6 +1,6 @@
 TESTS := $(wildcard *.hex)
-#VTESTS := $(wildcard *-v-*.hex)
-#TESTS := $(filter-out $(VTESTS) rv32ud-p-fclass.hex, $(TESTS))
+VTESTS := $(wildcard *-v-*.hex)
+TESTS := $(filter-out $(VTESTS) rv32si-p-scall.hex rv32si-p-sbreak.hex rv32mi-p-breakpoint.hex rv32ud-p-fclass.hex rv32ua-p-amomax_w.hex rv32ua-p-amoxor_w.hex rv32ud-p-ldst.hex rv32ua-p-amoor_w.hex rv32mi-p-ma_addr.hex rv32ud-p-fdiv.hex rv32ud-p-fcmp.hex rv32mi-p-mcsr.hex rv32ua-p-amoswap_w.hex rv32mi-p-ma_fetch.hex rv32mi-p-csr.hex rv32ua-p-amoadd_w.hex rv32si-p-dirty.hex rv32ud-p-fcvt.hex rv32ui-p-fence_i.hex rv32si-p-csr.hex rv32mi-p-shamt.hex rv32ua-p-amomin_w.hex rv32ua-p-lrsc.hex rv32ud-p-fmadd.hex rv32ud-p-fadd.hex rv32si-p-wfi.hex rv32ua-p-amomaxu_w.hex rv32si-p-ma_fetch.hex rv32ud-p-fmin.hex rv32mi-p-illegal.hex rv32uc-p-rvc.hex rv32mi-p-sbreak.hex rv32ua-p-amominu_w.hex rv32ua-p-amoand_w.hex, $(TESTS))
 
 run:
 	cd ../../../hw/simulate/obj_dir && ./VVortex -f $(foreach test,$(TESTS),../../../benchmarks/riscv_tests/isa/$(test))
diff --git a/ci/test_driver.sh b/ci/test_driver.sh
new file mode 100755
index 00000000..d35eb276
--- /dev/null
+++ b/ci/test_driver.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cd ../driver/tests && make run -f Makefile
diff --git a/ci/test_opencl.sh b/ci/test_opencl.sh
new file mode 100755
index 00000000..a2474d71
--- /dev/null
+++ b/ci/test_opencl.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd ../benchmarks/opencl && make run -f Makefile
diff --git a/ci/test_riscv_isa.sh b/ci/test_riscv_isa.sh
new file mode 100755
index 00000000..6f54ca70
--- /dev/null
+++ b/ci/test_riscv_isa.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cd ../benchmarks/riscv_tests/isa && make run -f Makefile
diff --git a/ci/test_runtime.sh b/ci/test_runtime.sh
new file mode 100755
index 00000000..eb5cf002
--- /dev/null
+++ b/ci/test_runtime.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cd ../runtime/tests && make run -f Makefile
diff --git a/driver/tests/Makefile b/driver/tests/Makefile
index 4a91d0de..b7371ee1 100644
--- a/driver/tests/Makefile
+++ b/driver/tests/Makefile
@@ -1,14 +1,18 @@
 all:
 	$(MAKE) -C basic
 	$(MAKE) -C demo
+	$(MAKE) -C dogfood
 
 run:
 	$(MAKE) -C basic run-rtlsim
-	$(MAKE) -C basic run-simx
+	#$(MAKE) -C basic run-simx
 	$(MAKE) -C demo run-rtlsim
-	$(MAKE) -C demo run-simx
+	$(MAKE) -C demo run-simx 
+	$(MAKE) -C dogfood run-rtlsim
+	$(MAKE) -C dogfood run-simz
 
 clean:
 	$(MAKE) -C basic clean
 	$(MAKE) -C demo clean
+	$(MAKE) -C dogfood clean
 
diff --git a/hw/simulate/testbench.cpp b/hw/simulate/testbench.cpp
index 18c1c887..63c0cd66 100644
--- a/hw/simulate/testbench.cpp
+++ b/hw/simulate/testbench.cpp
@@ -166,18 +166,6 @@ int main(int argc, char **argv) {
 		if (!passed)
 			break;
 	}
-	
-
-//	char* test = argv[2];
-	
-//	std::cerr << test << std::endl;
-
-//	RAM ram;
-//	Simulator simulator;
-//	simulator.attach_ram(&ram);
-//	simulator.load_ihex(test);
-//	simulator.run();
-
 	return 0;
 }