diff --git a/I2_Dobble/makefile b/I2_Dobble/makefile
index e855199..918e956 100644
--- a/I2_Dobble/makefile
+++ b/I2_Dobble/makefile
@@ -1,5 +1,6 @@
 CC = gcc
-FLAGS = -g -Wall -lm
+CFLAGS = -g -Wall
+LDFLAGS = -lm
 
 ifeq ($(OS),Windows_NT)
 	include makefile_windows.variables
@@ -27,29 +28,33 @@ doble_initial:
 program_obj_files = stack.o bintree.o numbers.o timer.o highscore.o
 
 doble : main.o $(program_obj_files)
-	$(CC) $(FLAGS) $^ -o doble
+	$(CC) $(FLAGS) $(LDFLAGS) $^ -o doble
 
 $(program_obj_filesobj_files): %.o: %.c
-	$(CC) -c $(FLAGS) -g3 -fPIC $^ -o $@
+	$(CC) -c $(FLAGS) $^ -o $@
 
-# --------------------------
-# Stack Tests
-# --------------------------
-stackTests : stack.o test_stack.c
-	$(CC) $(FLAGS) -g3 $^ -o stackTest
-	
 # --------------------------
 # Unit Tests
 # --------------------------
-unitTests:
-	echo "needs to be implemented"
+unitTests: numbersTest
+	./runNumbersTest
+	./runStackTest
+
+numbersTest: numbers.o bintree.o numbersTest.o $($(unityfolder)/unity.c)
+	$(CC) $(FLAGS) $(LDFLAGS) $^ -o runNumbersTest
+
+stackTest: stack.o stackTest.o $($(unityfolder)/unity.c)
+	$(CC) $(FLAGS) $(LDFLAGS) $^ -o runStackTest
+
+%.o: %.c
+	$(CC) -c $(FLAGS) $< -o $@
 
 # --------------------------
 # Clean
 # --------------------------
 clean:
 ifeq ($(OS),Windows_NT)
-	del /f *.o doble
+	del /f *.o doble runNumbersTest
 else
-	rm -f *.o doble
-endif
+	rm -f *.o doble runNumbersTest
+endif
\ No newline at end of file