diff --git a/Makefile b/Makefile
index d46c45a..1d33953 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,13 @@ SRC_FILES = $(wildcard $(SRC_DIR)/*.c)
 OBJ_FILES = $(patsubst $(SRC_DIR)/%.c, $(OBJ_DIR)/%.o, $(SRC_FILES))
 OBJ_FILES_NOMAIN = $(filter-out $(OBJ_DIR)/main.o, $(OBJ_FILES)) # Object files without main.c.
 GRAM_FILES = $(GRAM_DIR)/grammar.tab.c $(GRAM_DIR)/grammar.tab.h
-UNITY_C = $(TEST_DIR)/unity/unity.c
+UNITY_DIR = $(TEST_DIR)/Unity
+UNITY_C = $(UNITY_DIR)/src/unity.c
+UNITY_H = $(UNITY_DIR)/src/unity.h
+UNITY_OBJ = $(TEST_BUILD_DIR)/unity.o
 TEST_SRC_FILES = $(wildcard $(TEST_DIR)/*.c)
 TEST_OBJ_FILES = $(patsubst $(TEST_DIR)/%.c, $(TEST_OBJ_DIR)/%.o, $(TEST_SRC_FILES))
+TEST_BIN_FILES = $(patsubst $(TEST_DIR)/%.c, $(TEST_BUILD_DIR)/%.out, $(TEST_SRC_FILES))
 
 RESETCOLOR = \033[0m
 WHITE = $(RESETCOLOR)\033[37m
@@ -34,51 +38,60 @@ release: clean
 release: CFLAGS = -Wall -O2
 release: $(TARGET)
 
+# Run the target.
 run: $(TARGET)
-	@ echo -e "$(WHITE_BOLD)Running... $(RESETCOLOR)./$(TARGET)"
-	@ ./$(TARGET)
+	./$(TARGET)
 
 # Generate grammars with bison.
 $(GRAM_FILES): $(SRC_DIR)/grammar.y
 	@ mkdir -p $(GRAM_DIR)
-	@ echo -e "$(WHITE_BOLD)Generating grammars...$(RESETCOLOR) bison $< -o$(GRAM_DIR)/grammar.tab.c -H$(GRAM_DIR)/grammar.tab.h"
-	@ bison $< -o$(GRAM_DIR)/grammar.tab.c -H$(GRAM_DIR)/grammar.tab.h
+	@ echo -e "$(WHITE_BOLD)Generating grammars...$(RESETCOLOR)"
+	bison $< -o$(GRAM_DIR)/grammar.tab.c -H$(GRAM_DIR)/grammar.tab.h
 
 # Compile grammars.
 $(OBJ_DIR)/grammar.o: $(GRAM_DIR)/grammar.tab.c $(GRAM_DIR)/grammar.tab.h $(OBJ_DIR)/lexer.o
+	@ echo -e "$(WHITE_BOLD)Compiling grammars...$(RESETCOLOR)"
 	$(CC) $(CFLAGS) -c $< -o $@
 
 # Lexer depends on grammars.
 $(OBJ_DIR)/lexer.o: $(SRC_DIR)/lexer.c $(GRAM_FILES)
 	@ mkdir -p $(OBJ_DIR)
+	@ echo -e "$(WHITE_BOLD)Compiling source object $(WHITE)$@$(WHITE_BOLD)... $(RESETCOLOR)"
 	$(CC) $(CFLAGS) -c $< -o $@
 
-# Compile project sources.
+# Compile project source objects.
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(INC_DIR)/%.h
 	@ mkdir -p $(OBJ_DIR)
-	@ echo -e "$(WHITE_BOLD)Compiling $(WHITE)$<$(WHITE_BOLD)... $(RESETCOLOR)$(CC) $(CFLAGS) -c $< -o $@"
-	@ $(CC) $(CFLAGS) -c $< -o $@
+	@ echo -e "$(WHITE_BOLD)Compiling source object $(WHITE)$@$(WHITE_BOLD)... $(RESETCOLOR)"
+	$(CC) $(CFLAGS) -c $< -o $@
 
 # Link to final binary.
 $(TARGET): $(OBJ_DIR)/grammar.o $(OBJ_FILES)
-	@ echo -e "$(WHITE_BOLD)Linking $(WHITE)$(TARGET)$(WHITE_BOLD)...$(RESETCOLOR) $(CC) -o $(TARGET) $(OBJ_FILES) $(LDFLAGS)"
-	@ $(LINK) -o $(TARGET) $(OBJ_FILES) $(OBJ_DIR)/grammar.o $(LDFLAGS)
+	@ echo -e "$(WHITE_BOLD)Linking $(WHITE)$@$(WHITE_BOLD)...$(RESETCOLOR)"
+	$(LINK) -o $(TARGET) $(OBJ_FILES) $(OBJ_DIR)/grammar.o $(LDFLAGS)
 
-# Compile test sources.
-$(TEST_OBJ_DIR)/%.o: $(TEST_DIR)/%.c
-	@ mkdir -p $(TEST_OBJ_DIR)
-	@ echo -e "$(WHITE_BOLD)Compiling Test $(WHITE)$<$(WHITE_BOLD)... $(WHITE)$(CC) $(CFLAGS) -I$(SRC_DIR)/include -c $< -o $@$(RESETCOLOR)"
-	@ $(CC) $(CFLAGS) -I$(SRC_DIR)/include -c $< -o $@
+# Compile Unity object.
+$(UNITY_OBJ): $(UNITY_C) $(UNITY_H)
+	@ echo -e "$(WHITE_BOLD)Compiling Unity...$(RESETCOLOR)"
+	$(CC) $(CFLAGS) -D UNITY_OUTPUT_COLOR -c $< -o $@
 
-# Link the test executable.
-test: $(TEST_OBJ_FILES) $(OBJ_FILES_NOMAIN) $(UNITY_C)
-	@ echo -e "$(WHITE_BOLD)Linking test binary$(WHITE)...$(RESETCOLOR)"
-	@ $(LINK) -DUNITY_OUTPUT_COLOR $(TEST_OBJ_FILES) $(OBJ_FILES_NOMAIN) $(UNITY_C) -o $(TEST_BUILD_DIR)/test.out
-	@ echo -e "$(WHITE_BOLD)Running tests$(WHITE)...$(RESETCOLOR)"
-	@ ./$(TEST_BUILD_DIR)/test.out
+# Compile test object.
+$(TEST_OBJ_DIR)/test_%.o: $(TEST_DIR)/test_%.c
+	@ echo -e "$(WHITE_BOLD)Compiling test object $(WHITE)$@$(WHITE_BOLD)...$(RESETCOLOR)"
+	$(CC) $(CFLAGS) -c $< -o $@
+
+# Link final test binary.
+$(TEST_BUILD_DIR)/test_%.out: $(TEST_OBJ_DIR)/test_%.o $(OBJ_DIR)/%.o $(UNITY_OBJ)
+	@ echo -e "$(WHITE_BOLD)Linking test binary $(WHITE)$@$(WHITE_BOLD)...$(RESETCOLOR)"
+	$(LINK) -o $@ $? $(LDFLAGS)
+
+# Run the test files.
+test: $(TEST_BIN_FILES)
+	@ echo -e "$(WHITE_BOLD)Running tests...$(RESETCOLOR)"
+	for test in $< do ./$${test}; done
 
 clean:
-	@ echo -e "$(WHITE_BOLD)Cleaning up...$(WHITE) $(OBJ_DIR)/*.o $(TEST_OBJ_DIR)/*.o $(TEST_BUILD_DIR)/test.out $(TARGET) $(GRAM_DIR)/* $(RESETCOLOR)"
-	@ rm -rf $(OBJ_DIR)/*.o $(TEST_OBJ_DIR)/*.o $(TEST_BUILD_DIR)/test.out $(TARGET) $(GRAM_DIR)/*
+	@ echo -e "$(WHITE_BOLD)Cleaning up...$(RESETCOLOR)"
+	rm -rf $(OBJ_DIR)/*.o $(TEST_OBJ_DIR)/*.o $(TEST_BUILD_DIR)/test.out $(TARGET) $(GRAM_DIR)/* $(UNITY_OBJ)
 
 .PHONY: all clean test nocolor release run
diff --git a/src/include/main.h b/src/include/main.h
index 0258cb1..27a4921 100644
--- a/src/include/main.h
+++ b/src/include/main.h
@@ -1,4 +1,2 @@
 // This file serves no purpose but because I've written my makefile this way it
 // has to exist for things to compile :P. TODO: Fix this.
-
-int four() { return 4; }
diff --git a/test/main.c b/test/main.c
deleted file mode 100644
index e69de29..0000000