diff --git a/test/packets/binary.txt b/test/packets/binary.txt
deleted file mode 100644
index 6ea6c1f..0000000
--- a/test/packets/binary.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-:_source	some_source
-:_length	
-
-_method
-1234567
-|
-
diff --git a/test/packets/test-1-length-error b/test/packets/error-1-length
similarity index 100%
rename from test/packets/test-1-length-error
rename to test/packets/error-1-length
diff --git a/test/packets/test-2-list-error b/test/packets/error-2-list
similarity index 100%
rename from test/packets/test-2-list-error
rename to test/packets/error-2-list
diff --git a/test/packets/test-0-no-content b/test/packets/full-0-no-content
similarity index 100%
rename from test/packets/test-0-no-content
rename to test/packets/full-0-no-content
diff --git a/test/packets/test-1 b/test/packets/full-1
similarity index 100%
rename from test/packets/test-1
rename to test/packets/full-1
diff --git a/test/packets/test-1-length b/test/packets/full-1-length
similarity index 100%
rename from test/packets/test-1-length
rename to test/packets/full-1-length
diff --git a/test/packets/test-1-utf8 b/test/packets/full-1-utf8
similarity index 100%
rename from test/packets/test-1-utf8
rename to test/packets/full-1-utf8
diff --git a/test/packets/test-2-list b/test/packets/full-2-list
similarity index 100%
rename from test/packets/test-2-list
rename to test/packets/full-2-list
diff --git a/test/packets/test-3-list b/test/packets/full-3-list
similarity index 100%
rename from test/packets/test-3-list
rename to test/packets/full-3-list
diff --git a/test/packets/test-4-circuit b/test/packets/full-4-circuit
similarity index 100%
rename from test/packets/test-4-circuit
rename to test/packets/full-4-circuit
diff --git a/test/packets/test-5-message-private b/test/packets/full-5-message-private
similarity index 100%
rename from test/packets/test-5-message-private
rename to test/packets/full-5-message-private
diff --git a/test/packets/test-6-message-private-remote b/test/packets/full-6-message-private-remote
similarity index 100%
rename from test/packets/test-6-message-private-remote
rename to test/packets/full-6-message-private-remote
diff --git a/test/packets/fake_dns.txt b/test/packets/full-7-dns-fake
similarity index 100%
rename from test/packets/fake_dns.txt
rename to test/packets/full-7-dns-fake
diff --git a/test/packets/invalid_dns.txt b/test/packets/full-7-dns-invalid
similarity index 98%
rename from test/packets/invalid_dns.txt
rename to test/packets/full-7-dns-invalid
index 18e195d..96ce59e 100644
--- a/test/packets/invalid_dns.txt
+++ b/test/packets/full-7-dns-invalid
@@ -2,4 +2,3 @@
 
 _request_some_things
 |
-
diff --git a/test/packets/enter_leave_context.txt b/test/packets/full-8-enter-leave-context
similarity index 100%
rename from test/packets/enter_leave_context.txt
rename to test/packets/full-8-enter-leave-context
diff --git a/test/packets/part-1-length-p1 b/test/packets/part-1-length-p1
new file mode 120000
index 0000000..b934188
--- /dev/null
+++ b/test/packets/part-1-length-p1
@@ -0,0 +1 @@
+part-1-p1
\ No newline at end of file
diff --git a/test/packets/part-1-length-p2 b/test/packets/part-1-length-p2
new file mode 120000
index 0000000..e3f9bb4
--- /dev/null
+++ b/test/packets/part-1-length-p2
@@ -0,0 +1 @@
+part-1-p2
\ No newline at end of file
diff --git a/test/packets/test-1-length-p3 b/test/packets/part-1-length-p3
similarity index 100%
rename from test/packets/test-1-length-p3
rename to test/packets/part-1-length-p3
diff --git a/test/packets/part-1-length-p4 b/test/packets/part-1-length-p4
new file mode 120000
index 0000000..75d3aaf
--- /dev/null
+++ b/test/packets/part-1-length-p4
@@ -0,0 +1 @@
+part-1-p4
\ No newline at end of file
diff --git a/test/packets/part-1-length-p5 b/test/packets/part-1-length-p5
new file mode 120000
index 0000000..854fc1b
--- /dev/null
+++ b/test/packets/part-1-length-p5
@@ -0,0 +1 @@
+part-1-p5
\ No newline at end of file
diff --git a/test/packets/part-1-length-p6 b/test/packets/part-1-length-p6
new file mode 120000
index 0000000..3fc7513
--- /dev/null
+++ b/test/packets/part-1-length-p6
@@ -0,0 +1 @@
+part-1-p6
\ No newline at end of file
diff --git a/test/packets/part-1-length-p7 b/test/packets/part-1-length-p7
new file mode 120000
index 0000000..c4fd783
--- /dev/null
+++ b/test/packets/part-1-length-p7
@@ -0,0 +1 @@
+part-1-p7
\ No newline at end of file
diff --git a/test/packets/part-1-length-p8 b/test/packets/part-1-length-p8
new file mode 120000
index 0000000..46db87b
--- /dev/null
+++ b/test/packets/part-1-length-p8
@@ -0,0 +1 @@
+part-1-p8
\ No newline at end of file
diff --git a/test/packets/part-1-length-p9 b/test/packets/part-1-length-p9
new file mode 120000
index 0000000..d933075
--- /dev/null
+++ b/test/packets/part-1-length-p9
@@ -0,0 +1 @@
+part-1-p9
\ No newline at end of file
diff --git a/test/packets/test-1-p1 b/test/packets/part-1-p1
similarity index 100%
rename from test/packets/test-1-p1
rename to test/packets/part-1-p1
diff --git a/test/packets/test-1-p2 b/test/packets/part-1-p2
similarity index 100%
rename from test/packets/test-1-p2
rename to test/packets/part-1-p2
diff --git a/test/packets/test-1-p3 b/test/packets/part-1-p3
similarity index 100%
rename from test/packets/test-1-p3
rename to test/packets/part-1-p3
diff --git a/test/packets/test-1-p4 b/test/packets/part-1-p4
similarity index 100%
rename from test/packets/test-1-p4
rename to test/packets/part-1-p4
diff --git a/test/packets/test-1-p5 b/test/packets/part-1-p5
similarity index 100%
rename from test/packets/test-1-p5
rename to test/packets/part-1-p5
diff --git a/test/packets/test-1-p6 b/test/packets/part-1-p6
similarity index 100%
rename from test/packets/test-1-p6
rename to test/packets/part-1-p6
diff --git a/test/packets/test-1-p7 b/test/packets/part-1-p7
similarity index 100%
rename from test/packets/test-1-p7
rename to test/packets/part-1-p7
diff --git a/test/packets/test-1-p8 b/test/packets/part-1-p8
similarity index 100%
rename from test/packets/test-1-p8
rename to test/packets/part-1-p8
diff --git a/test/packets/test-1-p9 b/test/packets/part-1-p9
similarity index 100%
rename from test/packets/test-1-p9
rename to test/packets/part-1-p9
diff --git a/test/packets/test-1-length-p1 b/test/packets/test-1-length-p1
deleted file mode 120000
index e9d736a..0000000
--- a/test/packets/test-1-length-p1
+++ /dev/null
@@ -1 +0,0 @@
-test-1-p1
\ No newline at end of file
diff --git a/test/packets/test-1-length-p2 b/test/packets/test-1-length-p2
deleted file mode 120000
index 2f233e2..0000000
--- a/test/packets/test-1-length-p2
+++ /dev/null
@@ -1 +0,0 @@
-test-1-p2
\ No newline at end of file
diff --git a/test/packets/test-1-length-p4 b/test/packets/test-1-length-p4
deleted file mode 120000
index 778fb3c..0000000
--- a/test/packets/test-1-length-p4
+++ /dev/null
@@ -1 +0,0 @@
-test-1-p4
\ No newline at end of file
diff --git a/test/packets/test-1-length-p5 b/test/packets/test-1-length-p5
deleted file mode 120000
index 5411477..0000000
--- a/test/packets/test-1-length-p5
+++ /dev/null
@@ -1 +0,0 @@
-test-1-p5
\ No newline at end of file
diff --git a/test/packets/test-1-length-p6 b/test/packets/test-1-length-p6
deleted file mode 120000
index 86f1560..0000000
--- a/test/packets/test-1-length-p6
+++ /dev/null
@@ -1 +0,0 @@
-test-1-p6
\ No newline at end of file
diff --git a/test/packets/test-1-length-p7 b/test/packets/test-1-length-p7
deleted file mode 120000
index 3ca4aca..0000000
--- a/test/packets/test-1-length-p7
+++ /dev/null
@@ -1 +0,0 @@
-test-1-p7
\ No newline at end of file
diff --git a/test/packets/test-1-length-p8 b/test/packets/test-1-length-p8
deleted file mode 120000
index c8ee162..0000000
--- a/test/packets/test-1-length-p8
+++ /dev/null
@@ -1 +0,0 @@
-test-1-p8
\ No newline at end of file
diff --git a/test/packets/test-1-length-p9 b/test/packets/test-1-length-p9
deleted file mode 120000
index c8a65cb..0000000
--- a/test/packets/test-1-length-p9
+++ /dev/null
@@ -1 +0,0 @@
-test-1-p9
\ No newline at end of file