diff --git a/I2_Dobble/makefile b/I2_Dobble/makefile
index 328cc1a..24a5008 100644
--- a/I2_Dobble/makefile
+++ b/I2_Dobble/makefile
@@ -28,29 +28,38 @@ doble_initial:
 program_obj_files = stack.o bintree.o numbers.o timer.o highscore.o
 
 doble : main.o $(program_obj_files)
-	$(CC) $(FLAGS) $(LDFLAGS) $^ -o doble
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o doble
 
-$(program_obj_filesobj_files): %.o: %.c
-	$(CC) -c $(FLAGS) $^ -o $@
+$(program_obj_files): %.o: %.c
+	$(CC) -c $(CFLAGS) $^ -o $@
 
 # --------------------------
 # Unit Tests
 # --------------------------
-unitTests: numbersTest
+unity_src = $(unityfolder)/unity.c
+
+unitTests: numbersTest stackTest bintreeTest
 	./runNumbersTest
+	./runStackTest
+	./runBintreeTest
 
-numbersTest: numbers.o bintree.o numbersTest.o $($(unityfolder)/unity.c)
-	$(CC) $(FLAGS) $(LDFLAGS) $^ -o $@
+numbersTest: numbers.o bintree.o stack.o numbersTest.c $(unity_src) stack.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -I$(unityfolder) $^ -o runNumbersTest
 
+stackTest: stack.o stackTest.c $(unity_src)
+	$(CC) $(CFLAGS) $(LDFLAGS) -I$(unityfolder) $^ -o runStackTest
+
+bintreeTest: bintree.o bintreeTest.c $(unity_src) stack.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -I$(unityfolder) $^ -o runBintreeTest
 %.o: %.c
-	$(CC) -c $(FLAGS) $< -o $@
+	$(CC) -c $(CFLAGS) $< -o $@
 
 # --------------------------
 # Clean
 # --------------------------
 clean:
 ifeq ($(OS),Windows_NT)
-	del /f *.o doble runNumbersTest doble_initial
+	del /f *.o doble  doble_initial runNumbersTest runStackTest runBintreeTest
 else
-	rm -f *.o doble runNumbersTest doble_initial
+	rm -f *.o doble doble_initial runNumbersTest runStackTest runBintreeTest
 endif
\ No newline at end of file