diff --git a/tests/enc_c/Makefile b/tests/enc_c/Makefile
new file mode 100644
index 0000000..5ff24d9
--- /dev/null
+++ b/tests/enc_c/Makefile
@@ -0,0 +1,18 @@
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+    LINK_FLAGS := -fno-common -flat_namespace -bundle -undefined suppress
+else
+    LINK_FLAGS := -shared -fpic
+endif
+
+all: enc_c.so
+
+%.so:%.o
+	$(CC) $(LINK_FLAGS) -lprofanity -o $@ $^
+
+%.o:%.c
+	$(CC) $(INCLUDE) -D_GNU_SOURCE -D_BSD_SOURCE -fpic -g3 -O0 -std=c99 \
+        -Wextra -pedantic -c -o $@ $<
+
+clean:
+	$(RM) enc_c.so
diff --git a/tests/enc_c/enc_c.c b/tests/enc_c/enc_c.c
new file mode 100644
index 0000000..f2fb709
--- /dev/null
+++ b/tests/enc_c/enc_c.c
@@ -0,0 +1,143 @@
+#include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <profapi.h>
+
+void
+cmd_enc(char **args)
+{
+    if (args[0] && strcmp(args[0], "end") == 0) {
+        prof_encryption_reset(args[1]);
+
+    } else if (args[0] && (strcmp(args[0], "chat_title") == 0)) {
+        if (args[1] && (strcmp(args[1], "set") == 0)) {
+            prof_chat_set_titlebar_enctext(args[2], args[3]);
+        } else if (args[1] && (strcmp(args[1], "reset") == 0)) {
+            prof_chat_unset_titlebar_enctext(args[2]);
+        } else {
+            prof_cons_bad_cmd_usage("/enc_c");
+        }
+
+    } else if (args[0] && (strcmp(args[0], "chat_ch") == 0)) {
+        if (args[1] && (strcmp(args[1], "set") == 0)) {
+            if (args[2] && (strcmp(args[2], "in") == 0)) {
+                prof_chat_set_incoming_char(args[3], args[4]);
+            } else if (args[2] && (strcmp(args[2], "out") == 0)) {
+                prof_chat_set_outgoing_char(args[3], args[4]);
+            } else {
+                prof_cons_bad_cmd_usage("/enc_c");
+            }
+        } else if (args[1] && (strcmp(args[1], "reset") == 0)) {
+            if (args[2] && (strcmp(args[2], "in") == 0)) {
+                prof_chat_unset_incoming_char(args[3]);
+            } else if (args[2] && (strcmp(args[2], "out") == 0)) {
+                prof_chat_unset_outgoing_char(args[3]);
+            } else {
+                prof_cons_bad_cmd_usage("/enc_c");
+            }
+        } else {
+            prof_cons_bad_cmd_usage("/enc_c");
+        }
+
+    } else if (args[0] && (strcmp(args[0], "room_title") == 0)) {
+        if (args[1] && (strcmp(args[1], "set") == 0)) {
+            prof_room_set_titlebar_enctext(args[2], args[3]);
+        } else if (args[1] && (strcmp(args[1], "reset") == 0)) {
+            prof_room_unset_titlebar_enctext(args[2]);
+        } else {
+            prof_cons_bad_cmd_usage("/enc_c");
+        }
+
+    } else if (args[0] && (strcmp(args[0], "room_ch") == 0)) {
+        if (args[1] && (strcmp(args[1], "set") == 0)) {
+            prof_room_set_message_char(args[2], args[3]);
+        } else if (args[1] && (strcmp(args[1], "reset") == 0)) {
+            prof_room_unset_message_char(args[2]);
+        } else {
+            prof_cons_bad_cmd_usage("/enc_c");
+        }
+
+    } else if (args[0] && (strcmp(args[0], "chat_show") == 0)) {
+        prof_chat_show(args[1], args[2]);
+    
+    } else if (args[0] && (strcmp(args[0], "chat_show_themed") == 0)) {
+        prof_chat_show_themed(args[1], "enc_c", "chat_msg", NULL, "c", args[2]);
+
+    } else if (args[0] && (strcmp(args[0], "room_show") == 0)) {
+        prof_room_show(args[1], args[2]);
+    
+    } else if (args[0] && (strcmp(args[0], "room_show_themed") == 0)) {
+        prof_room_show_themed(args[1], "enc_c", "room_msg", NULL, "C", args[2]);
+
+    } else {
+        prof_cons_bad_cmd_usage("/enc_c");
+    }
+}
+
+void
+prof_init(const char * const version, const char * const status, const char *const account_name, const char *const fulljid)
+{
+    char *synopsis[] = { 
+        "/enc_c end <barejid>",
+        "/enc_c chat_title set <barejid> <text>",
+        "/enc_c chat_title unset <barejid>",
+        "/enc_c chat_ch set in <barejid> <ch>",
+        "/enc_c chat_ch reset in <barejid>",
+        "/enc_c chat_ch set out <barejid> <ch>",
+        "/enc_c chat_ch reset out <barejid>",
+        "/enc_c chat_show <barejid> <message>",
+        "/enc_c chat_show_themed <barejid> <message>",
+        "/enc_c room_title set <roomjid> <text>",
+        "/enc_c room_title unset <roomjid>",
+        "/enc_c room_ch set <roomjid> <ch>",
+        "/enc_c room_ch reset <roomjid>",
+        "/enc_c room_show <roomjid> <message>",
+        "/enc_c room_show_themed <roomjid> <message>",
+        NULL
+    };
+    char *description = "Various enc things";
+    char *args[][2] = { 
+        { "end <barejid>",                          "User to end the session with" },
+        { "chat_title set <barejid> <text>",        "Set encryption text in titlebar for recipient" },
+        { "chat_title reset <barejid>",             "Reset encryption text in titlebar for recipient" },
+        { "chat_ch set in <barejid> <ch>",          "Set incoming char for recipient" },
+        { "chat_ch reset in <barejid>",             "Reset incoming char for recipient" },
+        { "chat_ch set out <barejid> <ch>",         "Set outgoing char for recipient" },
+        { "chat_ch reset out <barejid>",            "Reset outgoing char for recipient" },
+        { "chat_show <barejid> <message>",          "Show chat message" },
+        { "chat_show_themed <barejid> <message>",   "Show themed chat message" },
+        { "room_title set <roomjid> <text>",        "Set encryption text in titlebar for room" },
+        { "room_title reset <roomjid>",             "Reset encryption text in titlebar for room" },
+        { "room_ch set <roomjid> <ch>",             "Set char for room" },
+        { "room_ch reset <roomjid>",                "Reset char for room" },
+        { "room_show <roomjid> <message>",          "Show chat room message" },
+        { "room_show_themed <roomjid> <message>",   "Show themed chat room message" },
+        { NULL, NULL } 
+    };
+    char *examples[] = { NULL };
+
+    prof_register_command("/enc_c", 2, 5, synopsis, description, args, examples, cmd_enc);
+ 
+    char *cmd_ac[] = { "end", "chat_title", "chat_ch", "chat_show", "chat_show_themed", "room_title", "room_ch", "room_show", "room_show_themed", NULL };
+    prof_completer_add("/enc_c", cmd_ac);
+
+    char *chat_title_ac[] = { "set", "reset", NULL };
+    prof_completer_add("/enc_c chat_title", chat_title_ac);
+
+    char *chat_ch_ac[] = { "set", "reset", NULL };
+    prof_completer_add("/enc_c chat_ch", chat_ch_ac);
+
+    char *chat_ch_set_ac[] = { "in", "out", NULL };
+    prof_completer_add("/enc_c chat_ch set", chat_ch_set_ac);
+
+    char *chat_ch_reset_ac[] = { "in", "out", NULL };
+    prof_completer_add("/enc_c chat_ch reset", chat_ch_reset_ac);
+
+    char *room_title_ac[] = { "set", "reset", NULL };
+    prof_completer_add("/enc_c room_title", room_title_ac);
+
+    char *room_ch_ac[] = { "set", "reset", NULL };
+    prof_completer_add("/enc_c room_ch", room_ch_ac);
+}
diff --git a/tests/enc_py.py b/tests/enc_py.py
new file mode 100644
index 0000000..741da46
--- /dev/null
+++ b/tests/enc_py.py
@@ -0,0 +1,99 @@
+import prof
+
+def _cmd_enc(arg1=None, arg2=None, arg3=None, arg4=None, arg5=None):
+    if arg1 == "end":
+        prof.encryption_reset(arg2)
+
+    elif arg1 == "chat_title" and arg2 == "set":
+        prof.chat_set_titlebar_enctext(arg3, arg4)
+
+    elif arg1 == "chat_title" and arg2 == "reset":
+        prof.chat_unset_titlebar_enctext(arg3)
+
+    elif arg1 == "chat_ch" and arg2 == "set" and arg3 == "in":
+        prof.chat_set_incoming_char(arg4, arg5)
+
+    elif arg1 == "chat_ch" and arg2 == "reset" and arg3 == "in":
+        prof.chat_unset_incoming_char(arg4)
+
+    elif arg1 == "chat_ch" and arg2 == "set" and arg3 == "out":
+        prof.chat_set_outgoing_char(arg4, arg5)
+
+    elif arg1 == "chat_ch" and arg2 == "reset" and arg3 == "out":
+        prof.chat_unset_outgoing_char(arg4)
+
+    elif arg1 == "room_title" and arg2 == "set":
+        prof.room_set_titlebar_enctext(arg3, arg4)
+
+    elif arg1 == "room_title" and arg2 == "reset":
+        prof.room_unset_titlebar_enctext(arg3)
+
+    elif arg1 == "room_ch" and arg2 == "set":
+        prof.room_set_message_char(arg3, arg4)
+
+    elif arg1 == "room_ch" and arg2 == "reset":
+        prof.room_unset_message_char(arg3)
+
+    elif arg1 == "chat_show":
+        prof.chat_show(arg2, arg3)
+
+    elif arg1 == "chat_show_themed":
+        prof.chat_show_themed(arg2, "enc_py", "chat_msg", None, "p", arg3)
+
+    elif arg1 == "room_show":
+        prof.room_show(arg2, arg3)
+
+    elif arg1 == "room_show_themed":
+        prof.room_show_themed(arg2, "enc_py", "room_msg", None, "P", arg3)
+
+    else:
+        prof.cons_bad_cmd_usage("/enc_py")
+
+
+def prof_init(version, status, account_name, fulljid):
+    synopsis = [ 
+        "/enc_py end <barejid>",
+        "/enc_py chat_title set <barejid> <text>",
+        "/enc_py chat_title unset <barejid>",
+        "/enc_py chat_ch set in <barejid> <ch>",
+        "/enc_py chat_ch reset in <barejid>",
+        "/enc_py chat_ch set out <barejid> <ch>",
+        "/enc_py chat_ch reset out <barejid>",
+        "/enc_py chat_show <barejid> <message>",
+        "/enc_py chat_show_themed <barejid> <message>",
+        "/enc_py room_title set <roomjid> <text>",
+        "/enc_py room_title unset <roomjid>"
+        "/enc_py room_ch set <roomjid> <ch>",
+        "/enc_py room_ch reset <roomjid>",
+        "/enc_py room_show <roomjid> <message>",
+        "/enc_py room_show_themed <roomjid> <message>"
+    ]
+    description = "Various enc things"
+    args = [
+        [ "end <barejid>",                          "User to end the session with" ],
+        [ "chat_title set <barejid> <text>",        "Set encryption text in titlebar for recipient" ],
+        [ "chat_title reset <barejid>",             "Reset encryption text in titlebar for recipient" ],
+        [ "chat_ch set in <barejid> <ch>",          "Set incoming char for recipient" ],
+        [ "chat_ch reset in <barejid>",             "Reset incoming char for recipient" ],
+        [ "chat_ch set out <barejid> <ch>",         "Set outgoing char for recipient" ],
+        [ "chat_ch reset out <barejid>",            "Reset outgoing char for recipient" ],
+        [ "chat_show <barejid> <message>",          "Show chat message" ],
+        [ "chat_show_themed <barejid> <message>",   "Show themed chat message" ],
+        [ "room_title set <roomjid> <text>",        "Set encryption text in titlebar for room" ],
+        [ "room_title reset <roomjid>",             "Reset encryption text in titlebar for room" ],
+        [ "room_ch set <roomjid> <ch>",             "Set char for room" ],
+        [ "room_ch reset <roomjid>",                "Reset char for room" ],
+        [ "room_show <roomjid> <message>",          "Show chat room message" ],
+        [ "room_show_themed <roomjid> <message>",   "Show themed chat room message" ]
+    ]
+    examples = []
+
+    prof.register_command("/enc_py", 2, 5, synopsis, description, args, examples, _cmd_enc)
+    prof.completer_add("/enc_py", [ "end", "chat_title", "chat_ch", "chat_show", "chat_show_themed", "room_title", "room_ch", "room_show", "room_show_themed" ])
+    prof.completer_add("/enc_py chat_title", [ "set", "reset" ])
+    prof.completer_add("/enc_py chat_ch", [ "set", "reset" ])
+    prof.completer_add("/enc_py chat_ch set", [ "in", "out" ])
+    prof.completer_add("/enc_py chat_ch reset", [ "in", "out" ])
+    prof.completer_add("/enc_py room_title", [ "set", "reset" ])
+    prof.completer_add("/enc_py room_ch", [ "set", "reset" ])
+