diff --git a/Makefile b/Makefile
index 582ea0d..ca77a11 100644
--- a/Makefile
+++ b/Makefile
@@ -58,16 +58,22 @@ ODFLAGS       :=-j .text -j .rodata -j .data -s
 
 compile: $(MEM)
 $(MEM_DIR):
-	@mkdir -p $@
+	@mkdir -p $@/tests/op
+
 $(MEM_DIR)/crt.o: $(BENCH_DIR)/crt.S |$(MEM_DIR)
 	$(CC) $(CFLAGS) -c $< -o $@
-$(MEM_DIR)/%.elf: $(BENCH_DIR)/%.c $(MEM_DIR)/crt.o|$(MEM_DIR)
+$(MEM_DIR)/%.elf: $(BENCH_DIR)/%.c $(MEM_DIR)/crt.o |$(MEM_DIR)
 	$(CC) $(ELFFLAGS) $< -o $@
 $(MEM_DIR)/%.elf: $(BENCH_DIR)/%.s |$(MEM_DIR)
 	$(CC) $(CFLAGS) -o $@ $<
 $(MEM_DIR)/%.mem: $(MEM_DIR)/%.elf |$(MEM_DIR) 
 	$(OBJDUMP) $(ODFLAGS) $< | awk -f $(OBTOMEM) | awk -f common/fix_mem.awk > $@
 
+$(MEM_DIR)/tests/%.mem: $(MEM_DIR)/tests/%.elf |$(MEM_DIR) 
+	$(OBJDUMP) $(ODFLAGS) $< | awk -f $(OBTOMEM) | awk -f common/fix_mem.awk > $@
+	echo $@
+	@PROOT=$(PWD) ./mill TPchisel.test.testOnly $(TOP_REP).$(TOP_TEST) -- -z "$$(echo $@)"
+
 
 ###############################################################################
 
diff --git a/bench/chenillard_minimaliste.s b/bench/programs/chenillard_minimaliste.s
similarity index 100%
rename from bench/chenillard_minimaliste.s
rename to bench/programs/chenillard_minimaliste.s
diff --git a/bench/chenillard_rotation.s b/bench/programs/chenillard_rotation.s
similarity index 100%
rename from bench/chenillard_rotation.s
rename to bench/programs/chenillard_rotation.s
diff --git a/bench/fmnsoc.h b/bench/programs/fmnsoc.h
similarity index 100%
rename from bench/fmnsoc.h
rename to bench/programs/fmnsoc.h
diff --git a/bench/invaders.c b/bench/programs/invaders.c
similarity index 100%
rename from bench/invaders.c
rename to bench/programs/invaders.c
diff --git a/bench/invaders.h b/bench/programs/invaders.h
similarity index 100%
rename from bench/invaders.h
rename to bench/programs/invaders.h
diff --git a/bench/compteur.s b/bench/tests/compteur.s
similarity index 100%
rename from bench/compteur.s
rename to bench/tests/compteur.s
diff --git a/bench/op/addi.s b/bench/tests/op/addi.s
similarity index 100%
rename from bench/op/addi.s
rename to bench/tests/op/addi.s
diff --git a/bench/op/andi.s b/bench/tests/op/andi.s
similarity index 100%
rename from bench/op/andi.s
rename to bench/tests/op/andi.s
diff --git a/bench/op/auipc.s b/bench/tests/op/auipc.s
similarity index 100%
rename from bench/op/auipc.s
rename to bench/tests/op/auipc.s
diff --git a/bench/op/lui.s b/bench/tests/op/lui.s
similarity index 100%
rename from bench/op/lui.s
rename to bench/tests/op/lui.s
diff --git a/bench/op/ori.s b/bench/tests/op/ori.s
similarity index 100%
rename from bench/op/ori.s
rename to bench/tests/op/ori.s
diff --git a/bench/stage1.s b/bench/tests/stage1.s
similarity index 100%
rename from bench/stage1.s
rename to bench/tests/stage1.s