diff --git a/Makefile b/Makefile
index 695e7c8..e95f681 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@ CXXFLAGS = -Wall -Wextra -Wpedantic -Wshadow -Wnon-virtual-dtor \
 -Wold-style-cast -Wcast-align -Wunused -Woverloaded-virtual -Wconversion \
 -Wsign-conversion -Wnull-dereference -Wdouble-promotion -Wformat=2 -std=c++17
 
+CXXFLAGS += -I.
+
 ifeq ($(RELEASE),)
     CFLAGS += -g -O0
     BUILD_TYPE = Debug
@@ -16,12 +18,17 @@ SRC = $(wildcard *.cc)
 HDR = $(wildcard *.h)
 OBJ = $(SRC:.cc=.o)
 
-all: main.elf
+all: main.elf test.elf
+test: test.elf
+	./test.elf
 
-main.elf: $(OBJ)
+main.elf: $(OBJ) | words.txt
 	@echo "Building & linking $@"
 	@$(CXX) $(CXXFLAGS) $^ -o $@
 
+test.elf: ordle.cc test/test.cc
+	@$(CXX) $(CXXFLAGS) $^ -o $@
+
 words.txt:
 	cat /usr/share/dict/words > words.txt
 
@@ -38,9 +45,9 @@ cppcheck:
 	cppcheck --enable=all --language=c++ --std=c++17 --suppress=missingIncludeSystem -I/usr/include $(SRC) $(HDR)
 
 format:
-	clang-format -i $(SRC) $(HDR)
+	clang-format -i $(SRC) $(HDR) **/*.cc
 
 clean:
 	rm -f *.o *.elf words.txt
 
-.PHONY: clean all lint clang-tidy cppcheck format
+.PHONY: clean all lint clang-tidy cppcheck format words.txt