diff --git a/2024/cmd/generate/test_template.go b/2024/cmd/generate/test_template.go
index 48aa6de..591089a 100644
--- a/2024/cmd/generate/test_template.go
+++ b/2024/cmd/generate/test_template.go
@@ -13,47 +13,37 @@ import (
 	"testing"
 )
 
-func TestDay%02d(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %%v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := -1
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%%d\ngot:\t%%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := -1
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%%d\ngot:\t%%d", expectedPart2, part2)
-	}
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
 }
 
-// func TestDay%02dSolutions(t *testing.T) {
-// 	filename := "input.txt"
-// 	if _, err := os.Stat(filename); os.IsNotExist(err) {
-// 		t.Fatalf("test file does not exist: %%v", filename)
-// 	}
-//
-// 	part1, part2 := Run(filename)
-//
-// 	expectedPart1 := -1
-// 	if part1 != expectedPart1 {
-// 		t.Fatalf("unexpected part1:\nwant:\t%%d\ngot:\t%%d", expectedPart1, part1)
-// 	}
-//
-// 	expectedPart2 := -1
-// 	if part2 != expectedPart2 {
-// 		t.Fatalf("unexpected part2:\nwant:\t%%d\ngot:\t%%d", expectedPart2, part2)
-// 	}
-// }
+func TestDay%02d(t *testing.T) {
+	tests := []TestCase{
+		{"test.txt", -1, -1},
+		// {"input.txt", -1, -1},
+	}
+
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %%v", test.FileName)
+		}
+
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%%s: unexpected part1:\nwant:\t%%v\ngot:\t%%v", test.FileName, test.Part1, part1)
+		}
+
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%%s: unexpected part2:\nwant:\t%%v\ngot:\t%%v", test.FileName, test.Part2, part2)
+		}
+	}
+}
 `
 
 func generateTestCode(day int) error {
-	testCode := fmt.Sprintf(testCodeTemplate, day, day, day)
+	testCode := fmt.Sprintf(testCodeTemplate, day, day)
 
 	filename := fmt.Sprintf("./day%02d/day%02d_test.go", day, day)
 
diff --git a/2024/day01/day01_test.go b/2024/day01/day01_test.go
index 9050391..dbaaa08 100644
--- a/2024/day01/day01_test.go
+++ b/2024/day01/day01_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay1(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 11, 31},
+		{"input.txt", 1258579, 23981443},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 11
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 31
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay1Solutions(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 1258579
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 23981443
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day02/day02_test.go b/2024/day02/day02_test.go
index a9008e4..a76afb3 100644
--- a/2024/day02/day02_test.go
+++ b/2024/day02/day02_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay2(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 2, 4},
+		{"input.txt", 663, 692},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 2
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 4
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay2Solution(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 663
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 692
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day03/day03_test.go b/2024/day03/day03_test.go
index 9e8460e..08f7fdf 100644
--- a/2024/day03/day03_test.go
+++ b/2024/day03/day03_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay3(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 161, 48},
+		{"input.txt", 187833789, 94455185},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 161
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 48
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay3Solution(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 187833789
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 94455185
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day04/day04_test.go b/2024/day04/day04_test.go
index 776e71a..d7cf685 100644
--- a/2024/day04/day04_test.go
+++ b/2024/day04/day04_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay4(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 18, 9},
+		{"input.txt", 2603, 1965},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 18
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 9
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay4Solution(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 2603
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 1965
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day05/day05_test.go b/2024/day05/day05_test.go
index fbf32f0..b33a87b 100644
--- a/2024/day05/day05_test.go
+++ b/2024/day05/day05_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay5(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 143, 123},
+		{"input.txt", 6498, 5017},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 143
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 123
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay5Solution(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 6498
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 5017
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day06/day06_test.go b/2024/day06/day06_test.go
index c913e8f..8d533d8 100644
--- a/2024/day06/day06_test.go
+++ b/2024/day06/day06_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay6(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 41, 6},
+		{"input.txt", 5101, 1951},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 41
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 6
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay6Solution(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 5101
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 1951
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day07/day07_test.go b/2024/day07/day07_test.go
index 907aace..6a79fa5 100644
--- a/2024/day07/day07_test.go
+++ b/2024/day07/day07_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay7(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 3749, 11387},
+		{"input.txt", 303876485655, 146111650210682},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 3749
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 11387
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay7Solution(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 303876485655
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 146111650210682
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day08/day08_test.go b/2024/day08/day08_test.go
index 73c3c60..6c821cb 100644
--- a/2024/day08/day08_test.go
+++ b/2024/day08/day08_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay8(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 14, 34},
+		{"input.txt", 327, 1233},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 14
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 34
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay8Solution(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 327
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 1233
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day09/day09_test.go b/2024/day09/day09_test.go
index 65d565e..f4b97dd 100644
--- a/2024/day09/day09_test.go
+++ b/2024/day09/day09_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay9(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 1928, 2858},
+		{"input.txt", 6435922584968, 6469636832766},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 1928
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 2858
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay9Solution(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 6435922584968
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 6469636832766
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day10/day10_test.go b/2024/day10/day10_test.go
index 2876dd2..336af17 100644
--- a/2024/day10/day10_test.go
+++ b/2024/day10/day10_test.go
@@ -5,40 +5,31 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay10(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 1, 16},
+		{"test2.txt", 36, 81},
+		{"input.txt", 461, 875},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 36
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 81
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay10Solution(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 461
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 875
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day10/test.txt b/2024/day10/test.txt
index cada9b3..a305b9d 100644
--- a/2024/day10/test.txt
+++ b/2024/day10/test.txt
@@ -1,8 +1,4 @@
-89010123
-78121874
-87430965
-96549874
-45678903
-32019012
-01329801
-10456732
+0123
+1234
+8765
+9876
diff --git a/2024/day10/test2.txt b/2024/day10/test2.txt
new file mode 100644
index 0000000..cada9b3
--- /dev/null
+++ b/2024/day10/test2.txt
@@ -0,0 +1,8 @@
+89010123
+78121874
+87430965
+96549874
+45678903
+32019012
+01329801
+10456732
diff --git a/2024/day11/day11_test.go b/2024/day11/day11_test.go
index e81b08e..065d87f 100644
--- a/2024/day11/day11_test.go
+++ b/2024/day11/day11_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay11(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 55312, 65601038650482},
+		{"input.txt", 197157, 234430066982597},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 55312
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 65601038650482
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay11Solution(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 197157
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 234430066982597
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day12/day12_test.go b/2024/day12/day12_test.go
index c305313..f07e078 100755
--- a/2024/day12/day12_test.go
+++ b/2024/day12/day12_test.go
@@ -5,40 +5,31 @@ import (
 	"testing"
 )
 
-func TestDay12(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 1930
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 1206
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
 }
 
-// func TestDay12Solutions(t *testing.T) {
-// 	filename := "input.txt"
-// 	if _, err := os.Stat(filename); os.IsNotExist(err) {
-// 		t.Fatalf("test file does not exist: %v", filename)
-// 	}
-//
-// 	part1, part2 := Run(filename)
-//
-// 	expectedPart1 := -1
-// 	if part1 != expectedPart1 {
-// 		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-// 	}
-//
-// 	expectedPart2 := -1
-// 	if part2 != expectedPart2 {
-// 		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-// 	}
-// }
+func TestDay12(t *testing.T) {
+	tests := []TestCase{
+		{"test.txt", 140, 80},
+		{"test2.txt", 1930, 1206},
+		{"input.txt", 1375574, 830566},
+	}
+
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
+
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
+
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
+	}
+}
diff --git a/2024/day12/test.txt b/2024/day12/test.txt
index 85b768f..b41163a 100755
--- a/2024/day12/test.txt
+++ b/2024/day12/test.txt
@@ -1,10 +1,4 @@
-RRRRIICCFF
-RRRRIICCCF
-VVRRRCCFFF
-VVRCCCJFFF
-VVVVCJJCFE
-VVIVCCJJEE
-VVIIICJJEE
-MIIIIIJJEE
-MIIISIJEEE
-MMMISSJEEE
+AAAA
+BBCD
+BBCC
+EEEC
diff --git a/2024/day12/test2.txt b/2024/day12/test2.txt
new file mode 100644
index 0000000..85b768f
--- /dev/null
+++ b/2024/day12/test2.txt
@@ -0,0 +1,10 @@
+RRRRIICCFF
+RRRRIICCCF
+VVRRRCCFFF
+VVRCCCJFFF
+VVVVCJJCFE
+VVIVCCJJEE
+VVIIICJJEE
+MIIIIIJJEE
+MIIISIJEEE
+MMMISSJEEE
diff --git a/2024/day13/day13_test.go b/2024/day13/day13_test.go
index c43dfba..1ef1c3b 100755
--- a/2024/day13/day13_test.go
+++ b/2024/day13/day13_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay13(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 480, 875318608908},
+		{"input.txt", 35997, 82510994362072},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 480
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 875318608908
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay13Solutions(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 35997
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 82510994362072
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day14/day14_test.go b/2024/day14/day14_test.go
index 9c9eaee..79d1482 100755
--- a/2024/day14/day14_test.go
+++ b/2024/day14/day14_test.go
@@ -5,35 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay14(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 21, 17},
+		{"input.txt", 211692000, 6587},
 	}
 
-	part1, _ := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 21
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-}
-
-func TestDay14Solutions(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 211692000
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 6587
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
+
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day15/day15_test.go b/2024/day15/day15_test.go
index e13b242..a9117d1 100755
--- a/2024/day15/day15_test.go
+++ b/2024/day15/day15_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay15(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", 10092, 9021},
+		{"input.txt", 1497888, 1522420},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 10092
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 9021
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay15Solutions(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 1497888
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 1522420
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day16/day16_test.go b/2024/day16/day16_test.go
index f272bf1..908150c 100755
--- a/2024/day16/day16_test.go
+++ b/2024/day16/day16_test.go
@@ -5,40 +5,31 @@ import (
 	"testing"
 )
 
-func TestDay16(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := 11048
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
-
-	expectedPart2 := 64
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
 }
 
-func TestDay16Solutions(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+func TestDay15(t *testing.T) {
+	tests := []TestCase{
+		{"test.txt", 11048, 64},
+		{"test2.txt", 7036, 45},
+		{"input.txt", 98520, 609},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := 98520
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%d\ngot:\t%d", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("%s: unexpected part1:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part1, part1)
+		}
 
-	expectedPart2 := 609
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("%s: unexpected part2:\nwant:\t%v\ngot:\t%v", test.FileName, test.Part2, part2)
+		}
 	}
 }
diff --git a/2024/day16/test2.txt b/2024/day16/test2.txt
new file mode 100644
index 0000000..2c21676
--- /dev/null
+++ b/2024/day16/test2.txt
@@ -0,0 +1,15 @@
+###############
+#.......#....E#
+#.#.###.#.###.#
+#.....#.#...#.#
+#.###.#####.#.#
+#.#.#.......#.#
+#.#.#####.###.#
+#...........#.#
+###.#.#####.#.#
+#...#.....#.#.#
+#.#.#.###.#.#.#
+#.....#...#.#.#
+#.###.#.#.#.#.#
+#S..#.....#...#
+###############
diff --git a/2024/day17/day17_test.go b/2024/day17/day17_test.go
index 48e135a..036d2dc 100755
--- a/2024/day17/day17_test.go
+++ b/2024/day17/day17_test.go
@@ -5,40 +5,30 @@ import (
 	"testing"
 )
 
+type TestCase struct {
+	FileName string
+	Part1    interface{}
+	Part2    interface{}
+}
+
 func TestDay17(t *testing.T) {
-	filename := "test.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
+	tests := []TestCase{
+		{"test.txt", "5,7,3,0", 117440},
+		{"input.txt", "2,3,6,2,1,6,1,2,1", 90938893795561},
 	}
 
-	part1, part2 := Run(filename)
+	for _, test := range tests {
+		if _, err := os.Stat(test.FileName); os.IsNotExist(err) {
+			t.Fatalf("test file does not exist: %v", test.FileName)
+		}
 
-	expectedPart1 := "5,7,3,0"
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%s\ngot:\t%s", expectedPart1, part1)
-	}
+		part1, part2 := Run(test.FileName)
+		if test.Part1 != nil && part1 != test.Part1 {
+			t.Fatalf("unexpected part1:\nwant:\t%v\ngot:\t%v", test.Part1, part1)
+		}
 
-	expectedPart2 := 117440
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
-	}
-}
-
-func TestDay17Solutions(t *testing.T) {
-	filename := "input.txt"
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		t.Fatalf("test file does not exist: %v", filename)
-	}
-
-	part1, part2 := Run(filename)
-
-	expectedPart1 := "2,3,6,2,1,6,1,2,1"
-	if part1 != expectedPart1 {
-		t.Fatalf("unexpected part1:\nwant:\t%s\ngot:\t%s", expectedPart1, part1)
-	}
-
-	expectedPart2 := 90938893795561
-	if part2 != expectedPart2 {
-		t.Fatalf("unexpected part2:\nwant:\t%d\ngot:\t%d", expectedPart2, part2)
+		if test.Part2 != nil && part2 != test.Part2 {
+			t.Fatalf("unexpected part2:\nwant:\t%v\ngot:\t%v", test.Part2, part2)
+		}
 	}
 }