diff --git a/chat/message_test.go b/chat/message_test.go
new file mode 100644
index 0000000..120a7ca
--- /dev/null
+++ b/chat/message_test.go
@@ -0,0 +1,34 @@
+package chat
+
+import "testing"
+
+func TestMessage(t *testing.T) {
+	var expected, actual string
+
+	expected = " * foo"
+	actual = NewMessage("foo").String()
+	if actual != expected {
+		t.Errorf("Got: `%s`; Expected: `%s`", actual, expected)
+	}
+
+	u := NewUser("foo")
+	expected = "foo: hello"
+	actual = NewMessage("hello").From(u).String()
+	if actual != expected {
+		t.Errorf("Got: `%s`; Expected: `%s`", actual, expected)
+	}
+
+	expected = "-> hello"
+	actual = NewMessage("hello").To(u).String()
+	if actual != expected {
+		t.Errorf("Got: `%s`; Expected: `%s`", actual, expected)
+	}
+
+	expected = "[PM from foo] hello"
+	actual = NewMessage("hello").From(u).To(u).String()
+	if actual != expected {
+		t.Errorf("Got: `%s`; Expected: `%s`", actual, expected)
+	}
+}
+
+// TODO: Add theme rendering tests