diff --git a/tests/functional/01_text-message/expected/data/out/files/.gitkeep b/tests/functional/01_avro-value/expected/data/out/files/.gitkeep
similarity index 100%
rename from tests/functional/01_text-message/expected/data/out/files/.gitkeep
rename to tests/functional/01_avro-value/expected/data/out/files/.gitkeep
diff --git a/tests/functional/02_avro-value/expected/data/out/tables/avro-value.manifest b/tests/functional/01_avro-value/expected/data/out/tables/avro-value.manifest
similarity index 100%
rename from tests/functional/02_avro-value/expected/data/out/tables/avro-value.manifest
rename to tests/functional/01_avro-value/expected/data/out/tables/avro-value.manifest
diff --git a/tests/functional/02_avro-value/expected/data/out/tables/avro-value/p0-0.csv b/tests/functional/01_avro-value/expected/data/out/tables/avro-value/p0-0.csv
similarity index 99%
rename from tests/functional/02_avro-value/expected/data/out/tables/avro-value/p0-0.csv
rename to tests/functional/01_avro-value/expected/data/out/tables/avro-value/p0-0.csv
index d217345..e3c9ea3 100644
--- a/tests/functional/02_avro-value/expected/data/out/tables/avro-value/p0-0.csv
+++ b/tests/functional/01_avro-value/expected/data/out/tables/avro-value/p0-0.csv
@@ -1,3 +1,3 @@
-avro-value,1,1732104020556,0,0,b'key3',"{'id': 3, 'key': 'avro-value-111', 'text': 'Test message 3'}"
-avro-value,1,1732104020556,0,1,b'key3',"{'id': 7, 'key': 'avro-value-111', 'text': 'Test message 7'}"
-avro-value,1,1732104020556,0,2,b'key3',"{'id': 11, 'key': 'avro-value-111', 'text': 'Test message 11'}"
+avro-value,1,1732104020556,0,0,b'key3',"{'id': 3, 'key': 'avro-value-111', 'text': 'Test message 3'}"
+avro-value,1,1732104020556,0,1,b'key3',"{'id': 7, 'key': 'avro-value-111', 'text': 'Test message 7'}"
+avro-value,1,1732104020556,0,2,b'key3',"{'id': 11, 'key': 'avro-value-111', 'text': 'Test message 11'}"
diff --git a/tests/functional/02_avro-value/expected/data/out/tables/avro-value/p1-0.csv b/tests/functional/01_avro-value/expected/data/out/tables/avro-value/p1-0.csv
similarity index 99%
rename from tests/functional/02_avro-value/expected/data/out/tables/avro-value/p1-0.csv
rename to tests/functional/01_avro-value/expected/data/out/tables/avro-value/p1-0.csv
index 24fff09..aa7c14a 100644
--- a/tests/functional/02_avro-value/expected/data/out/tables/avro-value/p1-0.csv
+++ b/tests/functional/01_avro-value/expected/data/out/tables/avro-value/p1-0.csv
@@ -1,8 +1,8 @@
-avro-value,1,1732104020556,1,0,b'key1',"{'id': 1, 'key': 'avro-value-111', 'text': 'Test message 1'}"
-avro-value,1,1732104020556,1,1,b'key2',"{'id': 2, 'key': 'avro-value-111', 'text': 'Test message 2'}"
-avro-value,1,1732104020556,1,2,b'key1',"{'id': 5, 'key': 'avro-value-111', 'text': 'Test message 5'}"
-avro-value,1,1732104020556,1,3,b'key2',"{'id': 6, 'key': 'avro-value-111', 'text': 'Test message 6'}"
-avro-value,1,1732104020556,1,4,b'key1',"{'id': 9, 'key': 'avro-value-111', 'text': 'Test message 9'}"
-avro-value,1,1732104020556,1,5,b'key2',"{'id': 10, 'key': 'avro-value-111', 'text': 'Test message 10'}"
-avro-value,1,1732104020556,1,6,b'key1',"{'id': 13, 'key': 'avro-value-111', 'text': 'Test message 13'}"
-avro-value,1,1732104020556,1,7,b'key2',"{'id': 14, 'key': 'avro-value-111', 'text': 'Test message 14'}"
+avro-value,1,1732104020556,1,0,b'key1',"{'id': 1, 'key': 'avro-value-111', 'text': 'Test message 1'}"
+avro-value,1,1732104020556,1,1,b'key2',"{'id': 2, 'key': 'avro-value-111', 'text': 'Test message 2'}"
+avro-value,1,1732104020556,1,2,b'key1',"{'id': 5, 'key': 'avro-value-111', 'text': 'Test message 5'}"
+avro-value,1,1732104020556,1,3,b'key2',"{'id': 6, 'key': 'avro-value-111', 'text': 'Test message 6'}"
+avro-value,1,1732104020556,1,4,b'key1',"{'id': 9, 'key': 'avro-value-111', 'text': 'Test message 9'}"
+avro-value,1,1732104020556,1,5,b'key2',"{'id': 10, 'key': 'avro-value-111', 'text': 'Test message 10'}"
+avro-value,1,1732104020556,1,6,b'key1',"{'id': 13, 'key': 'avro-value-111', 'text': 'Test message 13'}"
+avro-value,1,1732104020556,1,7,b'key2',"{'id': 14, 'key': 'avro-value-111', 'text': 'Test message 14'}"
diff --git a/tests/functional/02_avro-value/expected/data/out/tables/avro-value/p2-0.csv b/tests/functional/01_avro-value/expected/data/out/tables/avro-value/p2-0.csv
similarity index 99%
rename from tests/functional/02_avro-value/expected/data/out/tables/avro-value/p2-0.csv
rename to tests/functional/01_avro-value/expected/data/out/tables/avro-value/p2-0.csv
index 632db47..c62fa6a 100644
--- a/tests/functional/02_avro-value/expected/data/out/tables/avro-value/p2-0.csv
+++ b/tests/functional/01_avro-value/expected/data/out/tables/avro-value/p2-0.csv
@@ -1,4 +1,4 @@
-avro-value,1,1732104020556,2,0,b'key0',"{'id': 0, 'key': 'avro-value-111', 'text': 'Test message 0'}"
-avro-value,1,1732104020556,2,1,b'key0',"{'id': 4, 'key': 'avro-value-111', 'text': 'Test message 4'}"
-avro-value,1,1732104020556,2,2,b'key0',"{'id': 8, 'key': 'avro-value-111', 'text': 'Test message 8'}"
-avro-value,1,1732104020556,2,3,b'key0',"{'id': 12, 'key': 'avro-value-111', 'text': 'Test message 12'}"
+avro-value,1,1732104020556,2,0,b'key0',"{'id': 0, 'key': 'avro-value-111', 'text': 'Test message 0'}"
+avro-value,1,1732104020556,2,1,b'key0',"{'id': 4, 'key': 'avro-value-111', 'text': 'Test message 4'}"
+avro-value,1,1732104020556,2,2,b'key0',"{'id': 8, 'key': 'avro-value-111', 'text': 'Test message 8'}"
+avro-value,1,1732104020556,2,3,b'key0',"{'id': 12, 'key': 'avro-value-111', 'text': 'Test message 12'}"
diff --git a/tests/functional/02_avro-value/source/data/config.json b/tests/functional/01_avro-value/source/data/config.json
similarity index 100%
rename from tests/functional/02_avro-value/source/data/config.json
rename to tests/functional/01_avro-value/source/data/config.json
diff --git a/tests/functional/01_text-message/source/data/in/.gitkeep b/tests/functional/01_avro-value/source/data/in/.gitkeep
similarity index 100%
rename from tests/functional/01_text-message/source/data/in/.gitkeep
rename to tests/functional/01_avro-value/source/data/in/.gitkeep
diff --git a/tests/functional/01_text-message/source/data/in/files/.gitkeep b/tests/functional/01_avro-value/source/data/in/files/.gitkeep
similarity index 100%
rename from tests/functional/01_text-message/source/data/in/files/.gitkeep
rename to tests/functional/01_avro-value/source/data/in/files/.gitkeep
diff --git a/tests/functional/01_text-message/source/data/in/tables/.gitkeep b/tests/functional/01_avro-value/source/data/in/tables/.gitkeep
similarity index 100%
rename from tests/functional/01_text-message/source/data/in/tables/.gitkeep
rename to tests/functional/01_avro-value/source/data/in/tables/.gitkeep
diff --git a/tests/functional/01_text-message/source/data/out/files/.gitkeep b/tests/functional/01_avro-value/source/data/out/files/.gitkeep
similarity index 100%
rename from tests/functional/01_text-message/source/data/out/files/.gitkeep
rename to tests/functional/01_avro-value/source/data/out/files/.gitkeep
diff --git a/tests/functional/01_text-message/source/data/out/tables/.gitkeep b/tests/functional/01_avro-value/source/data/out/tables/.gitkeep
similarity index 100%
rename from tests/functional/01_text-message/source/data/out/tables/.gitkeep
rename to tests/functional/01_avro-value/source/data/out/tables/.gitkeep
diff --git a/tests/functional/02_avro-value/source/set_up.py b/tests/functional/01_avro-value/source/set_up.py
similarity index 100%
rename from tests/functional/02_avro-value/source/set_up.py
rename to tests/functional/01_avro-value/source/set_up.py
diff --git a/tests/functional/02_avro-value/expected/data/out/files/.gitkeep b/tests/functional/02_text-message/expected/data/out/files/.gitkeep
similarity index 100%
rename from tests/functional/02_avro-value/expected/data/out/files/.gitkeep
rename to tests/functional/02_text-message/expected/data/out/files/.gitkeep
diff --git a/tests/functional/01_text-message/expected/data/out/tables/text-message.manifest b/tests/functional/02_text-message/expected/data/out/tables/text-message.manifest
similarity index 100%
rename from tests/functional/01_text-message/expected/data/out/tables/text-message.manifest
rename to tests/functional/02_text-message/expected/data/out/tables/text-message.manifest
diff --git a/tests/functional/01_text-message/expected/data/out/tables/text-message/p0-0.csv b/tests/functional/02_text-message/expected/data/out/tables/text-message/p0-0.csv
similarity index 98%
rename from tests/functional/01_text-message/expected/data/out/tables/text-message/p0-0.csv
rename to tests/functional/02_text-message/expected/data/out/tables/text-message/p0-0.csv
index 69d6ec7..b3b0076 100644
--- a/tests/functional/01_text-message/expected/data/out/tables/text-message/p0-0.csv
+++ b/tests/functional/02_text-message/expected/data/out/tables/text-message/p0-0.csv
@@ -1,3 +1,3 @@
-text-message,1,1732104020556,0,0,b'key3',Test message 3
-text-message,1,1732104020556,0,1,b'key3',Test message 7
-text-message,1,1732104020556,0,2,b'key3',Test message 11
+text-message,1,1732104020556,0,0,b'key3',Test message 3
+text-message,1,1732104020556,0,1,b'key3',Test message 7
+text-message,1,1732104020556,0,2,b'key3',Test message 11
diff --git a/tests/functional/01_text-message/expected/data/out/tables/text-message/p1-0.csv b/tests/functional/02_text-message/expected/data/out/tables/text-message/p1-0.csv
similarity index 98%
rename from tests/functional/01_text-message/expected/data/out/tables/text-message/p1-0.csv
rename to tests/functional/02_text-message/expected/data/out/tables/text-message/p1-0.csv
index b3d4b2a..56aee1f 100644
--- a/tests/functional/01_text-message/expected/data/out/tables/text-message/p1-0.csv
+++ b/tests/functional/02_text-message/expected/data/out/tables/text-message/p1-0.csv
@@ -1,8 +1,8 @@
-text-message,1,1732104020556,1,0,b'key1',Test message 1
-text-message,1,1732104020556,1,1,b'key2',Test message 2
-text-message,1,1732104020556,1,2,b'key1',Test message 5
-text-message,1,1732104020556,1,3,b'key2',Test message 6
-text-message,1,1732104020556,1,4,b'key1',Test message 9
-text-message,1,1732104020556,1,5,b'key2',Test message 10
-text-message,1,1732104020556,1,6,b'key1',Test message 13
-text-message,1,1732104020556,1,7,b'key2',Test message 14
+text-message,1,1732104020556,1,0,b'key1',Test message 1
+text-message,1,1732104020556,1,1,b'key2',Test message 2
+text-message,1,1732104020556,1,2,b'key1',Test message 5
+text-message,1,1732104020556,1,3,b'key2',Test message 6
+text-message,1,1732104020556,1,4,b'key1',Test message 9
+text-message,1,1732104020556,1,5,b'key2',Test message 10
+text-message,1,1732104020556,1,6,b'key1',Test message 13
+text-message,1,1732104020556,1,7,b'key2',Test message 14
diff --git a/tests/functional/01_text-message/expected/data/out/tables/text-message/p2-0.csv b/tests/functional/02_text-message/expected/data/out/tables/text-message/p2-0.csv
similarity index 98%
rename from tests/functional/01_text-message/expected/data/out/tables/text-message/p2-0.csv
rename to tests/functional/02_text-message/expected/data/out/tables/text-message/p2-0.csv
index b85f549..52f2239 100644
--- a/tests/functional/01_text-message/expected/data/out/tables/text-message/p2-0.csv
+++ b/tests/functional/02_text-message/expected/data/out/tables/text-message/p2-0.csv
@@ -1,4 +1,4 @@
-text-message,1,1732104020556,2,0,b'key0',Test message 0
-text-message,1,1732104020556,2,1,b'key0',Test message 4
-text-message,1,1732104020556,2,2,b'key0',Test message 8
-text-message,1,1732104020556,2,3,b'key0',Test message 12
+text-message,1,1732104020556,2,0,b'key0',Test message 0
+text-message,1,1732104020556,2,1,b'key0',Test message 4
+text-message,1,1732104020556,2,2,b'key0',Test message 8
+text-message,1,1732104020556,2,3,b'key0',Test message 12
diff --git a/tests/functional/01_text-message/source/data/config.json b/tests/functional/02_text-message/source/data/config.json
similarity index 100%
rename from tests/functional/01_text-message/source/data/config.json
rename to tests/functional/02_text-message/source/data/config.json
diff --git a/tests/functional/02_avro-value/source/data/in/.gitkeep b/tests/functional/02_text-message/source/data/in/.gitkeep
similarity index 100%
rename from tests/functional/02_avro-value/source/data/in/.gitkeep
rename to tests/functional/02_text-message/source/data/in/.gitkeep
diff --git a/tests/functional/02_avro-value/source/data/in/files/.gitkeep b/tests/functional/02_text-message/source/data/in/files/.gitkeep
similarity index 100%
rename from tests/functional/02_avro-value/source/data/in/files/.gitkeep
rename to tests/functional/02_text-message/source/data/in/files/.gitkeep
diff --git a/tests/functional/02_avro-value/source/data/in/tables/.gitkeep b/tests/functional/02_text-message/source/data/in/tables/.gitkeep
similarity index 100%
rename from tests/functional/02_avro-value/source/data/in/tables/.gitkeep
rename to tests/functional/02_text-message/source/data/in/tables/.gitkeep
diff --git a/tests/functional/02_avro-value/source/data/out/files/.gitkeep b/tests/functional/02_text-message/source/data/out/files/.gitkeep
similarity index 100%
rename from tests/functional/02_avro-value/source/data/out/files/.gitkeep
rename to tests/functional/02_text-message/source/data/out/files/.gitkeep
diff --git a/tests/functional/02_avro-value/source/data/out/tables/.gitkeep b/tests/functional/02_text-message/source/data/out/tables/.gitkeep
similarity index 100%
rename from tests/functional/02_avro-value/source/data/out/tables/.gitkeep
rename to tests/functional/02_text-message/source/data/out/tables/.gitkeep
diff --git a/tests/functional/01_text-message/source/set_up.py b/tests/functional/02_text-message/source/set_up.py
similarity index 100%
rename from tests/functional/01_text-message/source/set_up.py
rename to tests/functional/02_text-message/source/set_up.py