diff --git a/test/zelda3/message_test.cc b/test/zelda3/message_test.cc
index f536b5f7..4bddd1e3 100644
--- a/test/zelda3/message_test.cc
+++ b/test/zelda3/message_test.cc
@@ -51,5 +51,63 @@ TEST_F(MessageTest, ParseSingleMessage_BasicAscii) {
   EXPECT_THAT(parsed, ::testing::ElementsAre("ABC"));
 }
 
+TEST_F(MessageTest, FindMatchingCharacter_Success) {
+  EXPECT_EQ(editor::FindMatchingCharacter('A'), 0x00);
+  EXPECT_EQ(editor::FindMatchingCharacter('Z'), 0x19);
+  EXPECT_EQ(editor::FindMatchingCharacter('a'), 0x1A);
+  EXPECT_EQ(editor::FindMatchingCharacter('z'), 0x33);
+}
+
+TEST_F(MessageTest, FindMatchingCharacter_Failure) {
+  EXPECT_EQ(editor::FindMatchingCharacter('@'), 0xFF);
+  EXPECT_EQ(editor::FindMatchingCharacter('#'), 0xFF);
+}
+
+TEST_F(MessageTest, FindDictionaryEntry_Success) {
+  EXPECT_EQ(editor::FindDictionaryEntry(0x88), 0x00);
+  EXPECT_EQ(editor::FindDictionaryEntry(0x90), 0x08);
+}
+
+TEST_F(MessageTest, FindDictionaryEntry_Failure) {
+  EXPECT_EQ(editor::FindDictionaryEntry(0x00), -1);
+  EXPECT_EQ(editor::FindDictionaryEntry(0xFF), -1);
+}
+
+TEST_F(MessageTest, ParseMessageToData_Basic) {
+  std::string input = "[L][C:01]ABC";
+  auto result = editor::ParseMessageToData(input);
+  std::vector<uint8_t> expected = {0x6A, 0x77, 0x01, 0x00, 0x01, 0x02};
+  EXPECT_EQ(result, expected);
+}
+
+TEST_F(MessageTest, ReplaceAllDictionaryWords_Success) {
+  std::vector<editor::DictionaryEntry> mock_dict = {
+    editor::DictionaryEntry(0x00, "test"),
+    editor::DictionaryEntry(0x01, "message")
+  };
+  std::string input = "This is a test message.";
+  auto result = editor::ReplaceAllDictionaryWords(input, mock_dict);
+  EXPECT_EQ(result, "This is a [D:00] [D:01].");
+}
+
+TEST_F(MessageTest, ReplaceAllDictionaryWords_NoMatch) {
+  std::vector<editor::DictionaryEntry> mock_dict = {
+    editor::DictionaryEntry(0x00, "hello")
+  };
+  std::string input = "No matching words.";
+  auto result = editor::ReplaceAllDictionaryWords(input, mock_dict);
+  EXPECT_EQ(result, "No matching words.");
+}
+
+TEST_F(MessageTest, ParseTextDataByte_Success) {
+  EXPECT_EQ(editor::ParseTextDataByte(0x00), "A");
+  EXPECT_EQ(editor::ParseTextDataByte(0x74), "[1]");
+  EXPECT_EQ(editor::ParseTextDataByte(0x88), "[D:0]");
+}
+
+TEST_F(MessageTest, ParseTextDataByte_Failure) {
+  EXPECT_EQ(editor::ParseTextDataByte(0xFF), "");
+}
+
 }  // namespace test
 }  // namespace yaze