tests: standardize naming convention

Use a behavior-driven naming convention for unit tests. Functions are now named using the pattern: [unit]__[verb]__[scenario] The __ works as a semantic separator. Examples: * jid_create__returns__null_from_null() * cmd_connect__shows__usage_when_no_server_value Benefits: * Easy to find all tests associated with a specific function using the mandatory prefix. * Test output in CI now explicitly describes the unit, the expected outcome, and the scenario being tested. Also disabled keyhandlers tests due to missing code in src/ui.
2026-02-28 12:41:33 +01:00
parent a7408a970e
commit e81435be06
53 changed files with 1601 additions and 1433 deletions
--- a/tests/unittests/command/test_cmd_account.c
+++ b/tests/unittests/command/test_cmd_account.c
@@ -15,7 +15,7 @@
 #define CMD_ACCOUNT "/account"

 void
-cmd_account_shows_usage_when_not_connected_and_no_args(void** state)
+cmd_account__shows__usage_when_not_connected_and_no_args(void** state)
 {
    gchar* args[] = { NULL };

@@ -28,7 +28,7 @@ cmd_account_shows_usage_when_not_connected_and_no_args(void** state)
 }

 void
-cmd_account_shows_account_when_connected_and_no_args(void** state)
+cmd_account__shows__account_when_connected_and_no_args(void** state)
 {
    ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("me@jabber.org"), NULL, NULL,
                                       TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0);
@@ -46,7 +46,7 @@ cmd_account_shows_account_when_connected_and_no_args(void** state)
 }

 void
-cmd_account_list_shows_accounts(void** state)
+cmd_account_list__shows__accounts(void** state)
 {
    gchar* args[] = { "list", NULL };

@@ -65,7 +65,7 @@ cmd_account_list_shows_accounts(void** state)
 }

 void
-cmd_account_show_shows_usage_when_no_arg(void** state)
+cmd_account_show__shows__usage_when_no_arg(void** state)
 {
    gchar* args[] = { "show", NULL };

@@ -76,7 +76,7 @@ cmd_account_show_shows_usage_when_no_arg(void** state)
 }

 void
-cmd_account_show_shows_message_when_account_does_not_exist(void** state)
+cmd_account_show__shows__message_when_account_does_not_exist(void** state)
 {
    gchar* args[] = { "show", "account_name", NULL };

@@ -91,7 +91,7 @@ cmd_account_show_shows_message_when_account_does_not_exist(void** state)
 }

 void
-cmd_account_show_shows_account_when_exists(void** state)
+cmd_account_show__shows__account_when_exists(void** state)
 {
    gchar* args[] = { "show", "account_name", NULL };
    ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("me@jabber.org"), NULL, NULL,
@@ -107,7 +107,7 @@ cmd_account_show_shows_account_when_exists(void** state)
 }

 void
-cmd_account_add_shows_usage_when_no_arg(void** state)
+cmd_account_add__shows__usage_when_no_arg(void** state)
 {
    gchar* args[] = { "add", NULL };

@@ -118,7 +118,7 @@ cmd_account_add_shows_usage_when_no_arg(void** state)
 }

 void
-cmd_account_add_adds_account(void** state)
+cmd_account_add__updates__adds_account(void** state)
 {
    gchar* args[] = { "add", "new_account", NULL };

@@ -133,7 +133,7 @@ cmd_account_add_adds_account(void** state)
 }

 void
-cmd_account_enable_shows_usage_when_no_arg(void** state)
+cmd_account_enable__shows__usage_when_no_arg(void** state)
 {
    gchar* args[] = { "enable", NULL };

@@ -144,7 +144,7 @@ cmd_account_enable_shows_usage_when_no_arg(void** state)
 }

 void
-cmd_account_enable_enables_account(void** state)
+cmd_account_enable__updates__enables_account(void** state)
 {
    gchar* args[] = { "enable", "account_name", NULL };

@@ -159,7 +159,7 @@ cmd_account_enable_enables_account(void** state)
 }

 void
-cmd_account_enable_shows_message_when_account_doesnt_exist(void** state)
+cmd_account_enable__shows__message_when_account_doesnt_exist(void** state)
 {
    gchar* args[] = { "enable", "account_name", NULL };

@@ -174,7 +174,7 @@ cmd_account_enable_shows_message_when_account_doesnt_exist(void** state)
 }

 void
-cmd_account_disable_shows_usage_when_no_arg(void** state)
+cmd_account_disable__shows__usage_when_no_arg(void** state)
 {
    gchar* args[] = { "disable", NULL };

@@ -185,7 +185,7 @@ cmd_account_disable_shows_usage_when_no_arg(void** state)
 }

 void
-cmd_account_disable_disables_account(void** state)
+cmd_account_disable__updates__disables_account(void** state)
 {
    gchar* args[] = { "disable", "account_name", NULL };

@@ -200,7 +200,7 @@ cmd_account_disable_disables_account(void** state)
 }

 void
-cmd_account_disable_shows_message_when_account_doesnt_exist(void** state)
+cmd_account_disable__shows__message_when_account_doesnt_exist(void** state)
 {
    gchar* args[] = { "disable", "account_name", NULL };

@@ -215,7 +215,7 @@ cmd_account_disable_shows_message_when_account_doesnt_exist(void** state)
 }

 void
-cmd_account_rename_shows_usage_when_no_args(void** state)
+cmd_account_rename__shows__usage_when_no_args(void** state)
 {
    gchar* args[] = { "rename", NULL };

@@ -226,7 +226,7 @@ cmd_account_rename_shows_usage_when_no_args(void** state)
 }

 void
-cmd_account_rename_shows_usage_when_one_arg(void** state)
+cmd_account_rename__shows__usage_when_one_arg(void** state)
 {
    gchar* args[] = { "rename", "original_name", NULL };

@@ -237,7 +237,7 @@ cmd_account_rename_shows_usage_when_one_arg(void** state)
 }

 void
-cmd_account_rename_renames_account(void** state)
+cmd_account_rename__updates__renames_account(void** state)
 {
    gchar* args[] = { "rename", "original_name", "new_name", NULL };

@@ -253,7 +253,7 @@ cmd_account_rename_renames_account(void** state)
 }

 void
-cmd_account_rename_shows_message_when_not_renamed(void** state)
+cmd_account_rename__shows__message_when_not_renamed(void** state)
 {
    gchar* args[] = { "rename", "original_name", "new_name", NULL };

@@ -269,7 +269,7 @@ cmd_account_rename_shows_message_when_not_renamed(void** state)
 }

 void
-cmd_account_set_shows_usage_when_no_args(void** state)
+cmd_account_set__shows__usage_when_no_args(void** state)
 {
    gchar* args[] = { "set", NULL };

@@ -280,7 +280,7 @@ cmd_account_set_shows_usage_when_no_args(void** state)
 }

 void
-cmd_account_set_shows_usage_when_one_arg(void** state)
+cmd_account_set__shows__usage_when_one_arg(void** state)
 {
    gchar* args[] = { "set", "a_account", NULL };

@@ -291,7 +291,7 @@ cmd_account_set_shows_usage_when_one_arg(void** state)
 }

 void
-cmd_account_set_shows_usage_when_two_args(void** state)
+cmd_account_set__shows__usage_when_two_args(void** state)
 {
    gchar* args[] = { "set", "a_account", "a_property", NULL };

@@ -302,7 +302,7 @@ cmd_account_set_shows_usage_when_two_args(void** state)
 }

 void
-cmd_account_set_shows_message_when_account_doesnt_exist(void** state)
+cmd_account_set__shows__message_when_account_doesnt_exist(void** state)
 {
    gchar* args[] = { "set", "a_account", "a_property", "a_value", NULL };

@@ -317,7 +317,7 @@ cmd_account_set_shows_message_when_account_doesnt_exist(void** state)
 }

 void
-cmd_account_set_jid_shows_message_for_malformed_jid(void** state)
+cmd_account_set__shows__message_for_malformed_jid(void** state)
 {
    gchar* args[] = { "set", "a_account", "jid", "@malformed", NULL };

@@ -331,7 +331,7 @@ cmd_account_set_jid_shows_message_for_malformed_jid(void** state)
 }

 void
-cmd_account_set_jid_sets_barejid(void** state)
+cmd_account_set__updates__jid_sets_barejid(void** state)
 {
    gchar* args[] = { "set", "a_account", "jid", "a_local@a_domain", NULL };

@@ -349,7 +349,7 @@ cmd_account_set_jid_sets_barejid(void** state)
 }

 void
-cmd_account_set_jid_sets_resource(void** state)
+cmd_account_set__updates__jid_sets_resource(void** state)
 {
    gchar* args[] = { "set", "a_account", "jid", "a_local@a_domain/a_resource", NULL };

@@ -372,7 +372,7 @@ cmd_account_set_jid_sets_resource(void** state)
 }

 void
-cmd_account_set_server_sets_server(void** state)
+cmd_account_set__updates__server_sets_server(void** state)
 {
    gchar* args[] = { "set", "a_account", "server", "a_server", NULL };

@@ -390,7 +390,7 @@ cmd_account_set_server_sets_server(void** state)
 }

 void
-cmd_account_set_resource_sets_resource(void** state)
+cmd_account_set__updates__resource_sets_resource(void** state)
 {
    gchar* args[] = { "set", "a_account", "resource", "a_resource", NULL };

@@ -410,7 +410,7 @@ cmd_account_set_resource_sets_resource(void** state)
 }

 void
-cmd_account_set_resource_sets_resource_with_online_message(void** state)
+cmd_account_set__shows__resource_sets_resource_with_online_message(void** state)
 {
    gchar* args[] = { "set", "a_account", "resource", "a_resource", NULL };

@@ -430,7 +430,7 @@ cmd_account_set_resource_sets_resource_with_online_message(void** state)
 }

 void
-cmd_account_set_password_sets_password(void** state)
+cmd_account_set__updates__password_sets_password(void** state)
 {
    gchar* args[] = { "set", "a_account", "password", "a_password", NULL };
    ProfAccount* account = account_new(g_strdup("a_account"), NULL, NULL, NULL,
@@ -453,7 +453,7 @@ cmd_account_set_password_sets_password(void** state)
 }

 void
-cmd_account_set_eval_password_sets_eval_password(void** state)
+cmd_account_set__updates__eval_password_sets_eval_password(void** state)
 {
    gchar* args[] = { "set", "a_account", "eval_password", "a_password", NULL };
    ProfAccount* account = account_new(g_strdup("a_account"), NULL, NULL, NULL,
@@ -476,7 +476,7 @@ cmd_account_set_eval_password_sets_eval_password(void** state)
 }

 void
-cmd_account_set_password_when_eval_password_set(void** state)
+cmd_account_set__shows__password_when_eval_password_set(void** state)
 {
    gchar* args[] = { "set", "a_account", "password", "a_password", NULL };
    ProfAccount* account = account_new(g_strdup("a_account"), NULL, NULL, g_strdup("a_password"),
@@ -495,7 +495,7 @@ cmd_account_set_password_when_eval_password_set(void** state)
 }

 void
-cmd_account_set_eval_password_when_password_set(void** state)
+cmd_account_set__shows__eval_password_when_password_set(void** state)
 {
    gchar* args[] = { "set", "a_account", "eval_password", "a_password", NULL };
    ProfAccount* account = account_new(g_strdup("a_account"), NULL, g_strdup("a_password"), NULL,
@@ -514,7 +514,7 @@ cmd_account_set_eval_password_when_password_set(void** state)
 }

 void
-cmd_account_set_muc_sets_muc(void** state)
+cmd_account_set__updates__muc_sets_muc(void** state)
 {
    gchar* args[] = { "set", "a_account", "muc", "a_muc", NULL };

@@ -532,7 +532,7 @@ cmd_account_set_muc_sets_muc(void** state)
 }

 void
-cmd_account_set_nick_sets_nick(void** state)
+cmd_account_set__updates__nick_sets_nick(void** state)
 {
    gchar* args[] = { "set", "a_account", "nick", "a_nick", NULL };

@@ -550,7 +550,7 @@ cmd_account_set_nick_sets_nick(void** state)
 }

 void
-cmd_account_show_message_for_missing_otr_policy(void** state)
+cmd_account_set__shows__message_for_missing_otr_policy(void** state)
 {
    gchar* args[] = { "set", "a_account", "otr", NULL };

@@ -561,7 +561,7 @@ cmd_account_show_message_for_missing_otr_policy(void** state)
 }

 void
-cmd_account_show_message_for_invalid_otr_policy(void** state)
+cmd_account_set__shows__message_for_invalid_otr_policy(void** state)
 {
    gchar* args[] = { "set", "a_account", "otr", "bad_otr_policy", NULL };

@@ -576,7 +576,7 @@ cmd_account_show_message_for_invalid_otr_policy(void** state)
 }

 void
-cmd_account_set_otr_sets_otr(void** state)
+cmd_account_set__updates__otr_sets_otr(void** state)
 {
    gchar* args[] = { "set", "a_account", "otr", "opportunistic", NULL };

@@ -594,7 +594,7 @@ cmd_account_set_otr_sets_otr(void** state)
 }

 void
-cmd_account_set_status_shows_message_when_invalid_status(void** state)
+cmd_account_set__shows__message_when_invalid_status(void** state)
 {
    gchar* args[] = { "set", "a_account", "status", "bad_status", NULL };

@@ -609,7 +609,7 @@ cmd_account_set_status_shows_message_when_invalid_status(void** state)
 }

 void
-cmd_account_set_status_sets_status_when_valid(void** state)
+cmd_account_set__updates__status_sets_status_when_valid(void** state)
 {
    gchar* args[] = { "set", "a_account", "status", "away", NULL };

@@ -627,7 +627,7 @@ cmd_account_set_status_sets_status_when_valid(void** state)
 }

 void
-cmd_account_set_status_sets_status_when_last(void** state)
+cmd_account_set__updates__status_sets_status_when_last(void** state)
 {
    gchar* args[] = { "set", "a_account", "status", "last", NULL };

@@ -645,7 +645,7 @@ cmd_account_set_status_sets_status_when_last(void** state)
 }

 void
-cmd_account_set_invalid_presence_string_priority_shows_message(void** state)
+cmd_account_set__shows__invalid_presence_string_priority_message(void** state)
 {
    gchar* args[] = { "set", "a_account", "blah", "10", NULL };

@@ -660,7 +660,7 @@ cmd_account_set_invalid_presence_string_priority_shows_message(void** state)
 }

 void
-cmd_account_set_last_priority_shows_message(void** state)
+cmd_account_set__shows__last_priority_message(void** state)
 {
    gchar* args[] = { "set", "a_account", "last", "10", NULL };

@@ -675,7 +675,7 @@ cmd_account_set_last_priority_shows_message(void** state)
 }

 void
-cmd_account_set_online_priority_sets_preference(void** state)
+cmd_account_set__updates__online_priority_sets_preference(void** state)
 {
    gchar* args[] = { "set", "a_account", "online", "10", NULL };

@@ -695,7 +695,7 @@ cmd_account_set_online_priority_sets_preference(void** state)
 }

 void
-cmd_account_set_chat_priority_sets_preference(void** state)
+cmd_account_set__updates__chat_priority_sets_preference(void** state)
 {
    gchar* args[] = { "set", "a_account", "chat", "10", NULL };

@@ -715,7 +715,7 @@ cmd_account_set_chat_priority_sets_preference(void** state)
 }

 void
-cmd_account_set_away_priority_sets_preference(void** state)
+cmd_account_set__updates__away_priority_sets_preference(void** state)
 {
    gchar* args[] = { "set", "a_account", "away", "10", NULL };

@@ -735,7 +735,7 @@ cmd_account_set_away_priority_sets_preference(void** state)
 }

 void
-cmd_account_set_xa_priority_sets_preference(void** state)
+cmd_account_set__updates__xa_priority_sets_preference(void** state)
 {
    gchar* args[] = { "set", "a_account", "xa", "10", NULL };

@@ -755,7 +755,7 @@ cmd_account_set_xa_priority_sets_preference(void** state)
 }

 void
-cmd_account_set_dnd_priority_sets_preference(void** state)
+cmd_account_set__updates__dnd_priority_sets_preference(void** state)
 {
    gchar* args[] = { "set", "a_account", "dnd", "10", NULL };

@@ -775,7 +775,7 @@ cmd_account_set_dnd_priority_sets_preference(void** state)
 }

 void
-cmd_account_set_priority_too_low_shows_message(void** state)
+cmd_account_set__shows__priority_too_low_message(void** state)
 {
    gchar* args[] = { "set", "a_account", "online", "-150", NULL };

@@ -789,7 +789,7 @@ cmd_account_set_priority_too_low_shows_message(void** state)
 }

 void
-cmd_account_set_priority_too_high_shows_message(void** state)
+cmd_account_set__shows__priority_too_high_message(void** state)
 {
    gchar* args[] = { "set", "a_account", "online", "150", NULL };

@@ -803,7 +803,7 @@ cmd_account_set_priority_too_high_shows_message(void** state)
 }

 void
-cmd_account_set_priority_when_not_number_shows_message(void** state)
+cmd_account_set__shows__priority_when_not_number_message(void** state)
 {
    gchar* args[] = { "set", "a_account", "online", "abc", NULL };

@@ -817,7 +817,7 @@ cmd_account_set_priority_when_not_number_shows_message(void** state)
 }

 void
-cmd_account_set_priority_when_empty_shows_message(void** state)
+cmd_account_set__shows__priority_when_empty_message(void** state)
 {
    gchar* args[] = { "set", "a_account", "online", "", NULL };

@@ -831,7 +831,7 @@ cmd_account_set_priority_when_empty_shows_message(void** state)
 }

 void
-cmd_account_set_priority_updates_presence_when_account_connected_with_presence(void** state)
+cmd_account_set__updates__priority_updates_presence_when_connected(void** state)
 {
    gchar* args[] = { "set", "a_account", "online", "10", NULL };

@@ -868,7 +868,7 @@ cmd_account_set_priority_updates_presence_when_account_connected_with_presence(v
 }

 void
-cmd_account_clear_shows_usage_when_no_args(void** state)
+cmd_account_clear__shows__usage_when_no_args(void** state)
 {
    gchar* args[] = { "clear", NULL };

@@ -879,7 +879,7 @@ cmd_account_clear_shows_usage_when_no_args(void** state)
 }

 void
-cmd_account_clear_shows_usage_when_one_arg(void** state)
+cmd_account_clear__shows__usage_when_one_arg(void** state)
 {
    gchar* args[] = { "clear", "a_account", NULL };

@@ -890,7 +890,7 @@ cmd_account_clear_shows_usage_when_one_arg(void** state)
 }

 void
-cmd_account_clear_shows_message_when_account_doesnt_exist(void** state)
+cmd_account_clear__shows__message_when_account_doesnt_exist(void** state)
 {
    gchar* args[] = { "clear", "a_account", "a_property", NULL };

@@ -905,7 +905,7 @@ cmd_account_clear_shows_message_when_account_doesnt_exist(void** state)
 }

 void
-cmd_account_clear_shows_message_when_invalid_property(void** state)
+cmd_account_clear__shows__message_when_invalid_property(void** state)
 {
    gchar* args[] = { "clear", "a_account", "badproperty", NULL };

--- a/tests/unittests/command/test_cmd_account.h
+++ b/tests/unittests/command/test_cmd_account.h
@@ -1,56 +1,61 @@
-void cmd_account_shows_usage_when_not_connected_and_no_args(void** state);
-void cmd_account_shows_account_when_connected_and_no_args(void** state);
-void cmd_account_list_shows_accounts(void** state);
-void cmd_account_show_shows_usage_when_no_arg(void** state);
-void cmd_account_show_shows_message_when_account_does_not_exist(void** state);
-void cmd_account_show_shows_account_when_exists(void** state);
-void cmd_account_add_shows_usage_when_no_arg(void** state);
-void cmd_account_add_adds_account(void** state);
-void cmd_account_enable_shows_usage_when_no_arg(void** state);
-void cmd_account_enable_enables_account(void** state);
-void cmd_account_enable_shows_message_when_account_doesnt_exist(void** state);
-void cmd_account_disable_shows_usage_when_no_arg(void** state);
-void cmd_account_disable_disables_account(void** state);
-void cmd_account_disable_shows_message_when_account_doesnt_exist(void** state);
-void cmd_account_rename_shows_usage_when_no_args(void** state);
-void cmd_account_rename_shows_usage_when_one_arg(void** state);
-void cmd_account_rename_renames_account(void** state);
-void cmd_account_rename_shows_message_when_not_renamed(void** state);
-void cmd_account_set_shows_usage_when_no_args(void** state);
-void cmd_account_set_shows_usage_when_one_arg(void** state);
-void cmd_account_set_shows_usage_when_two_args(void** state);
-void cmd_account_set_shows_message_when_account_doesnt_exist(void** state);
-void cmd_account_set_jid_shows_message_for_malformed_jid(void** state);
-void cmd_account_set_jid_sets_barejid(void** state);
-void cmd_account_set_jid_sets_resource(void** state);
-void cmd_account_set_server_sets_server(void** state);
-void cmd_account_set_resource_sets_resource(void** state);
-void cmd_account_set_resource_sets_resource_with_online_message(void** state);
-void cmd_account_set_password_sets_password(void** state);
-void cmd_account_set_eval_password_sets_eval_password(void** state);
-void cmd_account_set_password_when_eval_password_set(void** state);
-void cmd_account_set_eval_password_when_password_set(void** state);
-void cmd_account_set_muc_sets_muc(void** state);
-void cmd_account_set_nick_sets_nick(void** state);
-void cmd_account_show_message_for_missing_otr_policy(void** state);
-void cmd_account_show_message_for_invalid_otr_policy(void** state);
-void cmd_account_set_otr_sets_otr(void** state);
-void cmd_account_set_status_shows_message_when_invalid_status(void** state);
-void cmd_account_set_status_sets_status_when_valid(void** state);
-void cmd_account_set_status_sets_status_when_last(void** state);
-void cmd_account_set_invalid_presence_string_priority_shows_message(void** state);
-void cmd_account_set_last_priority_shows_message(void** state);
-void cmd_account_set_online_priority_sets_preference(void** state);
-void cmd_account_set_chat_priority_sets_preference(void** state);
-void cmd_account_set_away_priority_sets_preference(void** state);
-void cmd_account_set_xa_priority_sets_preference(void** state);
-void cmd_account_set_dnd_priority_sets_preference(void** state);
-void cmd_account_set_priority_too_low_shows_message(void** state);
-void cmd_account_set_priority_too_high_shows_message(void** state);
-void cmd_account_set_priority_when_not_number_shows_message(void** state);
-void cmd_account_set_priority_when_empty_shows_message(void** state);
-void cmd_account_set_priority_updates_presence_when_account_connected_with_presence(void** state);
-void cmd_account_clear_shows_usage_when_no_args(void** state);
-void cmd_account_clear_shows_usage_when_one_arg(void** state);
-void cmd_account_clear_shows_message_when_account_doesnt_exist(void** state);
-void cmd_account_clear_shows_message_when_invalid_property(void** state);
+#ifndef TESTS_TEST_CMD_ACCOUNT_H
+#define TESTS_TEST_CMD_ACCOUNT_H
+
+void cmd_account__shows__usage_when_not_connected_and_no_args(void** state);
+void cmd_account__shows__account_when_connected_and_no_args(void** state);
+void cmd_account_list__shows__accounts(void** state);
+void cmd_account_show__shows__usage_when_no_arg(void** state);
+void cmd_account_show__shows__message_when_account_does_not_exist(void** state);
+void cmd_account_show__shows__account_when_exists(void** state);
+void cmd_account_add__shows__usage_when_no_arg(void** state);
+void cmd_account_add__updates__adds_account(void** state);
+void cmd_account_enable__shows__usage_when_no_arg(void** state);
+void cmd_account_enable__updates__enables_account(void** state);
+void cmd_account_enable__shows__message_when_account_doesnt_exist(void** state);
+void cmd_account_disable__shows__usage_when_no_arg(void** state);
+void cmd_account_disable__updates__disables_account(void** state);
+void cmd_account_disable__shows__message_when_account_doesnt_exist(void** state);
+void cmd_account_rename__shows__usage_when_no_args(void** state);
+void cmd_account_rename__shows__usage_when_one_arg(void** state);
+void cmd_account_rename__updates__renames_account(void** state);
+void cmd_account_rename__shows__message_when_not_renamed(void** state);
+void cmd_account_set__shows__usage_when_no_args(void** state);
+void cmd_account_set__shows__usage_when_one_arg(void** state);
+void cmd_account_set__shows__usage_when_two_args(void** state);
+void cmd_account_set__shows__message_when_account_doesnt_exist(void** state);
+void cmd_account_set__shows__message_for_malformed_jid(void** state);
+void cmd_account_set__updates__jid_sets_barejid(void** state);
+void cmd_account_set__updates__jid_sets_resource(void** state);
+void cmd_account_set__updates__server_sets_server(void** state);
+void cmd_account_set__updates__resource_sets_resource(void** state);
+void cmd_account_set__shows__resource_sets_resource_with_online_message(void** state);
+void cmd_account_set__updates__password_sets_password(void** state);
+void cmd_account_set__updates__eval_password_sets_eval_password(void** state);
+void cmd_account_set__shows__password_when_eval_password_set(void** state);
+void cmd_account_set__shows__eval_password_when_password_set(void** state);
+void cmd_account_set__updates__muc_sets_muc(void** state);
+void cmd_account_set__updates__nick_sets_nick(void** state);
+void cmd_account_set__shows__message_for_missing_otr_policy(void** state);
+void cmd_account_set__shows__message_for_invalid_otr_policy(void** state);
+void cmd_account_set__updates__otr_sets_otr(void** state);
+void cmd_account_set__shows__message_when_invalid_status(void** state);
+void cmd_account_set__updates__status_sets_status_when_valid(void** state);
+void cmd_account_set__updates__status_sets_status_when_last(void** state);
+void cmd_account_set__shows__invalid_presence_string_priority_message(void** state);
+void cmd_account_set__shows__last_priority_message(void** state);
+void cmd_account_set__updates__online_priority_sets_preference(void** state);
+void cmd_account_set__updates__chat_priority_sets_preference(void** state);
+void cmd_account_set__updates__away_priority_sets_preference(void** state);
+void cmd_account_set__updates__xa_priority_sets_preference(void** state);
+void cmd_account_set__updates__dnd_priority_sets_preference(void** state);
+void cmd_account_set__shows__priority_too_low_message(void** state);
+void cmd_account_set__shows__priority_too_high_message(void** state);
+void cmd_account_set__shows__priority_when_not_number_message(void** state);
+void cmd_account_set__shows__priority_when_empty_message(void** state);
+void cmd_account_set__updates__priority_updates_presence_when_connected(void** state);
+void cmd_account_clear__shows__usage_when_no_args(void** state);
+void cmd_account_clear__shows__usage_when_one_arg(void** state);
+void cmd_account_clear__shows__message_when_account_doesnt_exist(void** state);
+void cmd_account_clear__shows__message_when_invalid_property(void** state);
+
+#endif
--- a/tests/unittests/command/test_cmd_alias.c
+++ b/tests/unittests/command/test_cmd_alias.c
@@ -17,7 +17,7 @@
 #define CMD_ALIAS "/alias"

 void
-cmd_alias_add_shows_usage_when_no_args(void** state)
+cmd_alias__shows__usage_when_add_no_args(void** state)
 {
    gchar* args[] = { "add", NULL };

@@ -28,7 +28,7 @@ cmd_alias_add_shows_usage_when_no_args(void** state)
 }

 void
-cmd_alias_add_shows_usage_when_no_value(void** state)
+cmd_alias__shows__usage_when_add_no_value(void** state)
 {
    gchar* args[] = { "add", "alias", NULL };

@@ -39,7 +39,7 @@ cmd_alias_add_shows_usage_when_no_value(void** state)
 }

 void
-cmd_alias_remove_shows_usage_when_no_args(void** state)
+cmd_alias__shows__usage_when_remove_no_args(void** state)
 {
    gchar* args[] = { "remove", NULL };

@@ -50,7 +50,7 @@ cmd_alias_remove_shows_usage_when_no_args(void** state)
 }

 void
-cmd_alias_show_usage_when_invalid_subcmd(void** state)
+cmd_alias__shows__usage_when_invalid_subcmd(void** state)
 {
    gchar* args[] = { "blah", NULL };

@@ -61,7 +61,7 @@ cmd_alias_show_usage_when_invalid_subcmd(void** state)
 }

 void
-cmd_alias_add_adds_alias(void** state)
+cmd_alias__updates__adds_alias(void** state)
 {
    gchar* args[] = { "add", "hc", "/help commands", NULL };

@@ -77,7 +77,7 @@ cmd_alias_add_adds_alias(void** state)
 }

 void
-cmd_alias_add_shows_message_when_exists(void** state)
+cmd_alias__shows__message_when_add_exists(void** state)
 {
    gchar* args[] = { "add", "hc", "/help commands", NULL };

@@ -91,7 +91,7 @@ cmd_alias_add_shows_message_when_exists(void** state)
 }

 void
-cmd_alias_remove_removes_alias(void** state)
+cmd_alias__updates__removes_alias(void** state)
 {
    gchar* args[] = { "remove", "hn", NULL };

@@ -109,7 +109,7 @@ cmd_alias_remove_removes_alias(void** state)
 }

 void
-cmd_alias_remove_shows_message_when_no_alias(void** state)
+cmd_alias__shows__message_when_remove_no_alias(void** state)
 {
    gchar* args[] = { "remove", "hn", NULL };

@@ -120,7 +120,7 @@ cmd_alias_remove_shows_message_when_no_alias(void** state)
 }

 void
-cmd_alias_list_shows_all_aliases(void** state)
+cmd_alias__shows__all_aliases(void** state)
 {
    gchar* args[] = { "list", NULL };

--- a/tests/unittests/command/test_cmd_alias.h
+++ b/tests/unittests/command/test_cmd_alias.h
@@ -1,9 +1,14 @@
-void cmd_alias_add_shows_usage_when_no_args(void** state);
-void cmd_alias_add_shows_usage_when_no_value(void** state);
-void cmd_alias_remove_shows_usage_when_no_args(void** state);
-void cmd_alias_show_usage_when_invalid_subcmd(void** state);
-void cmd_alias_add_adds_alias(void** state);
-void cmd_alias_add_shows_message_when_exists(void** state);
-void cmd_alias_remove_removes_alias(void** state);
-void cmd_alias_remove_shows_message_when_no_alias(void** state);
-void cmd_alias_list_shows_all_aliases(void** state);
+#ifndef TESTS_TEST_CMD_ALIAS_H
+#define TESTS_TEST_CMD_ALIAS_H
+
+void cmd_alias__shows__usage_when_add_no_args(void** state);
+void cmd_alias__shows__usage_when_add_no_value(void** state);
+void cmd_alias__shows__usage_when_remove_no_args(void** state);
+void cmd_alias__shows__usage_when_invalid_subcmd(void** state);
+void cmd_alias__updates__adds_alias(void** state);
+void cmd_alias__shows__message_when_add_exists(void** state);
+void cmd_alias__updates__removes_alias(void** state);
+void cmd_alias__shows__message_when_remove_no_alias(void** state);
+void cmd_alias__shows__all_aliases(void** state);
+
+#endif
--- a/tests/unittests/command/test_cmd_bookmark.c
+++ b/tests/unittests/command/test_cmd_bookmark.c
@@ -32,25 +32,25 @@ test_with_connection_status(jabber_conn_status_t status)
 }

 void
-cmd_bookmark_shows_message_when_disconnected(void** state)
+cmd_bookmark__shows__message_when_disconnected(void** state)
 {
    test_with_connection_status(JABBER_DISCONNECTED);
 }

 void
-cmd_bookmark_shows_message_when_disconnecting(void** state)
+cmd_bookmark__shows__message_when_disconnecting(void** state)
 {
    test_with_connection_status(JABBER_DISCONNECTING);
 }

 void
-cmd_bookmark_shows_message_when_connecting(void** state)
+cmd_bookmark__shows__message_when_connecting(void** state)
 {
    test_with_connection_status(JABBER_CONNECTING);
 }

 void
-cmd_bookmark_shows_usage_when_no_args(void** state)
+cmd_bookmark__shows__usage_when_no_args(void** state)
 {
    gchar* args[] = { NULL };
    ProfWin window;
@@ -90,7 +90,7 @@ _cmp_bookmark(Bookmark* bm1, Bookmark* bm2)
 }

 void
-cmd_bookmark_list_shows_bookmarks(void** state)
+cmd_bookmark_list__shows__bookmarks(void** state)
 {
    gchar* args[] = { "list", NULL };
    GList* bookmarks = NULL;
@@ -152,7 +152,7 @@ cmd_bookmark_list_shows_bookmarks(void** state)
 }

 void
-cmd_bookmark_add_shows_message_when_invalid_jid(void** state)
+cmd_bookmark_add__shows__message_when_invalid_jid(void** state)
 {
    char* jid = "room";
    gchar* args[] = { "add", jid, NULL };
@@ -169,7 +169,7 @@ cmd_bookmark_add_shows_message_when_invalid_jid(void** state)
 }

 void
-cmd_bookmark_add_adds_bookmark_with_jid(void** state)
+cmd_bookmark_add__updates__bookmark_with_jid(void** state)
 {
    char* jid = "room@conf.server";
    gchar* args[] = { "add", jid, NULL };
@@ -191,7 +191,7 @@ cmd_bookmark_add_adds_bookmark_with_jid(void** state)
 }

 void
-cmd_bookmark_uses_roomjid_in_room(void** state)
+cmd_bookmark__tests__uses_roomjid_in_room(void** state)
 {
    gchar* args[] = { NULL };
    ProfMucWin muc_win;
@@ -214,7 +214,7 @@ cmd_bookmark_uses_roomjid_in_room(void** state)
 }

 void
-cmd_bookmark_add_uses_roomjid_in_room(void** state)
+cmd_bookmark_add__tests__uses_roomjid_in_room(void** state)
 {
    gchar* args[] = { "add", NULL };
    ProfMucWin muc_win;
@@ -237,7 +237,7 @@ cmd_bookmark_add_uses_roomjid_in_room(void** state)
 }

 void
-cmd_bookmark_add_uses_supplied_jid_in_room(void** state)
+cmd_bookmark_add__tests__uses_supplied_jid_in_room(void** state)
 {
    char* jid = "room1@conf.server";
    gchar* args[] = { "add", jid, NULL };
@@ -261,7 +261,7 @@ cmd_bookmark_add_uses_supplied_jid_in_room(void** state)
 }

 void
-cmd_bookmark_add_adds_bookmark_with_jid_nick(void** state)
+cmd_bookmark_add__updates__bookmark_with_jid_nick(void** state)
 {
    char* jid = "room@conf.server";
    char* nick = "bob";
@@ -284,7 +284,7 @@ cmd_bookmark_add_adds_bookmark_with_jid_nick(void** state)
 }

 void
-cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void** state)
+cmd_bookmark_add__updates__bookmark_with_jid_autojoin(void** state)
 {
    char* jid = "room@conf.server";
    gchar* args[] = { "add", jid, "autojoin", "on", NULL };
@@ -306,7 +306,7 @@ cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void** state)
 }

 void
-cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void** state)
+cmd_bookmark_add__updates__bookmark_with_jid_nick_autojoin(void** state)
 {
    char* jid = "room@conf.server";
    char* nick = "bob";
@@ -329,7 +329,7 @@ cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void** state)
 }

 void
-cmd_bookmark_remove_removes_bookmark(void** state)
+cmd_bookmark_remove__updates__removes_bookmark(void** state)
 {
    char* jid = "room@conf.server";
    gchar* args[] = { "remove", jid, NULL };
@@ -348,7 +348,7 @@ cmd_bookmark_remove_removes_bookmark(void** state)
 }

 void
-cmd_bookmark_remove_shows_message_when_no_bookmark(void** state)
+cmd_bookmark_remove__shows__message_when_no_bookmark(void** state)
 {
    char* jid = "room@conf.server";
    gchar* args[] = { "remove", jid, NULL };
@@ -367,7 +367,7 @@ cmd_bookmark_remove_shows_message_when_no_bookmark(void** state)
 }

 void
-cmd_bookmark_remove_uses_roomjid_in_room(void** state)
+cmd_bookmark_remove__tests__uses_roomjid_in_room(void** state)
 {
    gchar* args[] = { "remove", NULL };
    ProfMucWin muc_win;
@@ -387,7 +387,7 @@ cmd_bookmark_remove_uses_roomjid_in_room(void** state)
 }

 void
-cmd_bookmark_remove_uses_supplied_jid_in_room(void** state)
+cmd_bookmark_remove__tests__uses_supplied_jid_in_room(void** state)
 {
    char* jid = "room1@conf.server";
    gchar* args[] = { "remove", jid, NULL };
--- a/tests/unittests/command/test_cmd_bookmark.h
+++ b/tests/unittests/command/test_cmd_bookmark.h
@@ -1,18 +1,23 @@
-void cmd_bookmark_shows_message_when_disconnected(void** state);
-void cmd_bookmark_shows_message_when_disconnecting(void** state);
-void cmd_bookmark_shows_message_when_connecting(void** state);
-void cmd_bookmark_shows_message_when_undefined(void** state);
-void cmd_bookmark_shows_usage_when_no_args(void** state);
-void cmd_bookmark_list_shows_bookmarks(void** state);
-void cmd_bookmark_add_shows_message_when_invalid_jid(void** state);
-void cmd_bookmark_add_adds_bookmark_with_jid(void** state);
-void cmd_bookmark_uses_roomjid_in_room(void** state);
-void cmd_bookmark_add_uses_roomjid_in_room(void** state);
-void cmd_bookmark_add_uses_supplied_jid_in_room(void** state);
-void cmd_bookmark_remove_uses_roomjid_in_room(void** state);
-void cmd_bookmark_remove_uses_supplied_jid_in_room(void** state);
-void cmd_bookmark_add_adds_bookmark_with_jid_nick(void** state);
-void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void** state);
-void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void** state);
-void cmd_bookmark_remove_removes_bookmark(void** state);
-void cmd_bookmark_remove_shows_message_when_no_bookmark(void** state);
+#ifndef TESTS_TEST_CMD_BOOKMARK_H
+#define TESTS_TEST_CMD_BOOKMARK_H
+
+void cmd_bookmark__shows__message_when_disconnected(void** state);
+void cmd_bookmark__shows__message_when_disconnecting(void** state);
+void cmd_bookmark__shows__message_when_connecting(void** state);
+void cmd_bookmark__shows__message_when_undefined(void** state);
+void cmd_bookmark__shows__usage_when_no_args(void** state);
+void cmd_bookmark_list__shows__bookmarks(void** state);
+void cmd_bookmark_add__shows__message_when_invalid_jid(void** state);
+void cmd_bookmark_add__updates__bookmark_with_jid(void** state);
+void cmd_bookmark__tests__uses_roomjid_in_room(void** state);
+void cmd_bookmark_add__tests__uses_roomjid_in_room(void** state);
+void cmd_bookmark_add__tests__uses_supplied_jid_in_room(void** state);
+void cmd_bookmark_remove__tests__uses_roomjid_in_room(void** state);
+void cmd_bookmark_remove__tests__uses_supplied_jid_in_room(void** state);
+void cmd_bookmark_add__updates__bookmark_with_jid_nick(void** state);
+void cmd_bookmark_add__updates__bookmark_with_jid_autojoin(void** state);
+void cmd_bookmark_add__updates__bookmark_with_jid_nick_autojoin(void** state);
+void cmd_bookmark_remove__updates__removes_bookmark(void** state);
+void cmd_bookmark_remove__shows__message_when_no_bookmark(void** state);
+
+#endif
--- a/tests/unittests/command/test_cmd_connect.c
+++ b/tests/unittests/command/test_cmd_connect.c
@@ -25,25 +25,25 @@ test_with_connection_status(jabber_conn_status_t status)
 }

 void
-cmd_connect_shows_message_when_disconnecting(void** state)
+cmd_connect__shows__message_when_disconnecting(void** state)
 {
    test_with_connection_status(JABBER_DISCONNECTING);
 }

 void
-cmd_connect_shows_message_when_connecting(void** state)
+cmd_connect__shows__message_when_connecting(void** state)
 {
    test_with_connection_status(JABBER_CONNECTING);
 }

 void
-cmd_connect_shows_message_when_connected(void** state)
+cmd_connect__shows__message_when_connected(void** state)
 {
    test_with_connection_status(JABBER_CONNECTED);
 }

 void
-cmd_connect_when_no_account(void** state)
+cmd_connect__tests__no_account(void** state)
 {
    gchar* args[] = { "user@server.org", NULL };

@@ -67,7 +67,7 @@ cmd_connect_when_no_account(void** state)
 }

 void
-cmd_connect_fail_message(void** state)
+cmd_connect__shows__fail_message(void** state)
 {
    gchar* args[] = { "user@server.org", NULL };

@@ -93,7 +93,7 @@ cmd_connect_fail_message(void** state)
 }

 void
-cmd_connect_lowercases_argument_with_no_account(void** state)
+cmd_connect__tests__lowercases_argument_with_no_account(void** state)
 {
    gchar* args[] = { "USER@server.ORG", NULL };

@@ -117,7 +117,7 @@ cmd_connect_lowercases_argument_with_no_account(void** state)
 }

 void
-cmd_connect_lowercases_argument_with_account(void** state)
+cmd_connect__tests__lowercases_argument_with_account(void** state)
 {
    gchar* args[] = { "Jabber_org", NULL };
    ProfAccount* account = account_new(g_strdup("Jabber_org"), g_strdup("me@jabber.org"), g_strdup("password"), NULL,
@@ -138,7 +138,7 @@ cmd_connect_lowercases_argument_with_account(void** state)
 }

 void
-cmd_connect_asks_password_when_not_in_account(void** state)
+cmd_connect__tests__asks_password_when_not_in_account(void** state)
 {
    gchar* args[] = { "jabber_org", NULL };
    ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("me@jabber.org"), NULL, NULL,
@@ -161,7 +161,7 @@ cmd_connect_asks_password_when_not_in_account(void** state)
 }

 void
-cmd_connect_shows_usage_when_no_server_value(void** state)
+cmd_connect__shows__usage_when_no_server_value(void** state)
 {
    gchar* args[] = { "user@server.org", "server", NULL };

@@ -175,7 +175,7 @@ cmd_connect_shows_usage_when_no_server_value(void** state)
 }

 void
-cmd_connect_shows_usage_when_server_no_port_value(void** state)
+cmd_connect__shows__usage_when_server_no_port_value(void** state)
 {
    gchar* args[] = { "user@server.org", "server", "aserver", "port", NULL };

@@ -189,7 +189,7 @@ cmd_connect_shows_usage_when_server_no_port_value(void** state)
 }

 void
-cmd_connect_shows_usage_when_no_port_value(void** state)
+cmd_connect__shows__usage_when_no_port_value(void** state)
 {
    gchar* args[] = { "user@server.org", "port", NULL };

@@ -203,7 +203,7 @@ cmd_connect_shows_usage_when_no_port_value(void** state)
 }

 void
-cmd_connect_shows_usage_when_port_no_server_value(void** state)
+cmd_connect__shows__usage_when_port_no_server_value(void** state)
 {
    gchar* args[] = { "user@server.org", "port", "5678", "server", NULL };

@@ -217,7 +217,7 @@ cmd_connect_shows_usage_when_port_no_server_value(void** state)
 }

 void
-cmd_connect_shows_message_when_port_0(void** state)
+cmd_connect__shows__message_when_port_0(void** state)
 {
    gchar* args[] = { "user@server.org", "port", "0", NULL };

@@ -231,7 +231,7 @@ cmd_connect_shows_message_when_port_0(void** state)
 }

 void
-cmd_connect_shows_message_when_port_minus1(void** state)
+cmd_connect__shows__message_when_port_minus1(void** state)
 {
    gchar* args[] = { "user@server.org", "port", "-1", NULL };

@@ -245,7 +245,7 @@ cmd_connect_shows_message_when_port_minus1(void** state)
 }

 void
-cmd_connect_shows_message_when_port_65536(void** state)
+cmd_connect__shows__message_when_port_65536(void** state)
 {
    gchar* args[] = { "user@server.org", "port", "65536", NULL };

@@ -259,7 +259,7 @@ cmd_connect_shows_message_when_port_65536(void** state)
 }

 void
-cmd_connect_shows_message_when_port_contains_chars(void** state)
+cmd_connect__shows__message_when_port_contains_chars(void** state)
 {
    gchar* args[] = { "user@server.org", "port", "52f66", NULL };

@@ -273,7 +273,7 @@ cmd_connect_shows_message_when_port_contains_chars(void** state)
 }

 void
-cmd_connect_shows_usage_when_server_provided_twice(void** state)
+cmd_connect__shows__usage_when_server_provided_twice(void** state)
 {
    gchar* args[] = { "user@server.org", "server", "server1", "server", "server2", NULL };

@@ -287,7 +287,7 @@ cmd_connect_shows_usage_when_server_provided_twice(void** state)
 }

 void
-cmd_connect_shows_usage_when_port_provided_twice(void** state)
+cmd_connect__shows__usage_when_port_provided_twice(void** state)
 {
    gchar* args[] = { "user@server.org", "port", "1111", "port", "1111", NULL };

@@ -301,7 +301,7 @@ cmd_connect_shows_usage_when_port_provided_twice(void** state)
 }

 void
-cmd_connect_shows_usage_when_invalid_first_property(void** state)
+cmd_connect__shows__usage_when_invalid_first_property(void** state)
 {
    gchar* args[] = { "user@server.org", "wrong", "server", NULL };

@@ -315,7 +315,7 @@ cmd_connect_shows_usage_when_invalid_first_property(void** state)
 }

 void
-cmd_connect_shows_usage_when_invalid_second_property(void** state)
+cmd_connect__shows__usage_when_invalid_second_property(void** state)
 {
    gchar* args[] = { "user@server.org", "server", "aserver", "wrong", "1234", NULL };

@@ -329,7 +329,7 @@ cmd_connect_shows_usage_when_invalid_second_property(void** state)
 }

 void
-cmd_connect_with_server_when_provided(void** state)
+cmd_connect__tests__with_server_when_provided(void** state)
 {
    gchar* args[] = { "user@server.org", "server", "aserver", NULL };

@@ -353,7 +353,7 @@ cmd_connect_with_server_when_provided(void** state)
 }

 void
-cmd_connect_with_port_when_provided(void** state)
+cmd_connect__tests__with_port_when_provided(void** state)
 {
    gchar* args[] = { "user@server.org", "port", "5432", NULL };

@@ -377,7 +377,7 @@ cmd_connect_with_port_when_provided(void** state)
 }

 void
-cmd_connect_with_server_and_port_when_provided(void** state)
+cmd_connect__tests__with_server_and_port_when_provided(void** state)
 {
    gchar* args[] = { "user@server.org", "port", "5432", "server", "aserver", NULL };

@@ -401,7 +401,7 @@ cmd_connect_with_server_and_port_when_provided(void** state)
 }

 void
-cmd_connect_shows_message_when_connecting_with_account(void** state)
+cmd_connect__shows__message_when_connecting_with_account(void** state)
 {
    gchar* args[] = { "jabber_org", NULL };
    ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("user@jabber.org"), g_strdup("password"), NULL,
@@ -422,7 +422,7 @@ cmd_connect_shows_message_when_connecting_with_account(void** state)
 }

 void
-cmd_connect_connects_with_account(void** state)
+cmd_connect__tests__connects_with_account(void** state)
 {
    gchar* args[] = { "jabber_org", NULL };
    ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("me@jabber.org"), g_strdup("password"), NULL,
--- a/tests/unittests/command/test_cmd_connect.h
+++ b/tests/unittests/command/test_cmd_connect.h
@@ -1,27 +1,32 @@
-void cmd_connect_shows_message_when_disconnecting(void** state);
-void cmd_connect_shows_message_when_connecting(void** state);
-void cmd_connect_shows_message_when_connected(void** state);
-void cmd_connect_shows_message_when_undefined(void** state);
-void cmd_connect_when_no_account(void** state);
-void cmd_connect_with_altdomain_when_provided(void** state);
-void cmd_connect_fail_message(void** state);
-void cmd_connect_lowercases_argument_with_no_account(void** state);
-void cmd_connect_lowercases_argument_with_account(void** state);
-void cmd_connect_asks_password_when_not_in_account(void** state);
-void cmd_connect_shows_message_when_connecting_with_account(void** state);
-void cmd_connect_connects_with_account(void** state);
-void cmd_connect_shows_usage_when_no_server_value(void** state);
-void cmd_connect_shows_usage_when_server_no_port_value(void** state);
-void cmd_connect_shows_usage_when_no_port_value(void** state);
-void cmd_connect_shows_usage_when_port_no_server_value(void** state);
-void cmd_connect_shows_message_when_port_0(void** state);
-void cmd_connect_shows_message_when_port_minus1(void** state);
-void cmd_connect_shows_message_when_port_65536(void** state);
-void cmd_connect_shows_message_when_port_contains_chars(void** state);
-void cmd_connect_with_server_when_provided(void** state);
-void cmd_connect_with_port_when_provided(void** state);
-void cmd_connect_with_server_and_port_when_provided(void** state);
-void cmd_connect_shows_usage_when_server_provided_twice(void** state);
-void cmd_connect_shows_usage_when_port_provided_twice(void** state);
-void cmd_connect_shows_usage_when_invalid_first_property(void** state);
-void cmd_connect_shows_usage_when_invalid_second_property(void** state);
+#ifndef TESTS_TEST_CMD_CONNECT_H
+#define TESTS_TEST_CMD_CONNECT_H
+
+void cmd_connect__shows__message_when_disconnecting(void** state);
+void cmd_connect__shows__message_when_connecting(void** state);
+void cmd_connect__shows__message_when_connected(void** state);
+void cmd_connect__shows__message_when_undefined(void** state);
+void cmd_connect__tests__no_account(void** state);
+void cmd_connect__tests__with_altdomain_when_provided(void** state);
+void cmd_connect__shows__fail_message(void** state);
+void cmd_connect__tests__lowercases_argument_with_no_account(void** state);
+void cmd_connect__tests__lowercases_argument_with_account(void** state);
+void cmd_connect__tests__asks_password_when_not_in_account(void** state);
+void cmd_connect__shows__message_when_connecting_with_account(void** state);
+void cmd_connect__tests__connects_with_account(void** state);
+void cmd_connect__shows__usage_when_no_server_value(void** state);
+void cmd_connect__shows__usage_when_server_no_port_value(void** state);
+void cmd_connect__shows__usage_when_no_port_value(void** state);
+void cmd_connect__shows__usage_when_port_no_server_value(void** state);
+void cmd_connect__shows__message_when_port_0(void** state);
+void cmd_connect__shows__message_when_port_minus1(void** state);
+void cmd_connect__shows__message_when_port_65536(void** state);
+void cmd_connect__shows__message_when_port_contains_chars(void** state);
+void cmd_connect__tests__with_server_when_provided(void** state);
+void cmd_connect__tests__with_port_when_provided(void** state);
+void cmd_connect__tests__with_server_and_port_when_provided(void** state);
+void cmd_connect__shows__usage_when_server_provided_twice(void** state);
+void cmd_connect__shows__usage_when_port_provided_twice(void** state);
+void cmd_connect__shows__usage_when_invalid_first_property(void** state);
+void cmd_connect__shows__usage_when_invalid_second_property(void** state);
+
+#endif
--- a/tests/unittests/command/test_cmd_disconnect.c
+++ b/tests/unittests/command/test_cmd_disconnect.c
@@ -12,7 +12,7 @@
 #define CMD_DISCONNECT "/disconnect"

 void
-clears_chat_sessions(void** state)
+cmd_disconnect__updates__clears_chat_sessions(void** state)
 {
    chat_sessions_init();
    roster_create();
--- a/tests/unittests/command/test_cmd_disconnect.h
+++ b/tests/unittests/command/test_cmd_disconnect.h
@@ -1 +1,6 @@
-void clears_chat_sessions(void** state);
+#ifndef TESTS_TEST_CMD_DISCONNECT_H
+#define TESTS_TEST_CMD_DISCONNECT_H
+
+void cmd_disconnect__updates__clears_chat_sessions(void** state);
+
+#endif
--- a/tests/unittests/command/test_cmd_join.c
+++ b/tests/unittests/command/test_cmd_join.c
@@ -27,25 +27,25 @@ test_with_connection_status(jabber_conn_status_t status)
 }

 void
-cmd_join_shows_message_when_disconnecting(void** state)
+cmd_join__shows__message_when_disconnecting(void** state)
 {
    test_with_connection_status(JABBER_DISCONNECTING);
 }

 void
-cmd_join_shows_message_when_connecting(void** state)
+cmd_join__shows__message_when_connecting(void** state)
 {
    test_with_connection_status(JABBER_CONNECTING);
 }

 void
-cmd_join_shows_message_when_disconnected(void** state)
+cmd_join__shows__message_when_disconnected(void** state)
 {
    test_with_connection_status(JABBER_DISCONNECTED);
 }

 void
-cmd_join_shows_error_message_when_invalid_room_jid(void** state)
+cmd_join__shows__error_message_when_invalid_room_jid(void** state)
 {
    gchar* args[] = { "//@@/", NULL };

@@ -59,7 +59,7 @@ cmd_join_shows_error_message_when_invalid_room_jid(void** state)
 }

 void
-cmd_join_uses_account_mucservice_when_no_service_specified(void** state)
+cmd_join__tests__uses_account_mucservice_when_no_service_specified(void** state)
 {
    gchar* account_name = g_strdup("an_account");
    char* room = "room";
@@ -85,7 +85,7 @@ cmd_join_uses_account_mucservice_when_no_service_specified(void** state)
 }

 void
-cmd_join_uses_supplied_nick(void** state)
+cmd_join__tests__uses_supplied_nick(void** state)
 {
    gchar* account_name = g_strdup("an_account");
    char* room = "room@conf.server.org";
@@ -109,7 +109,7 @@ cmd_join_uses_supplied_nick(void** state)
 }

 void
-cmd_join_uses_account_nick_when_not_supplied(void** state)
+cmd_join__tests__uses_account_nick_when_not_supplied(void** state)
 {
    gchar* account_name = g_strdup("an_account");
    char* room = "room2@conf.server.org";
@@ -133,7 +133,7 @@ cmd_join_uses_account_nick_when_not_supplied(void** state)
 }

 void
-cmd_join_uses_password_when_supplied(void** state)
+cmd_join__tests__uses_password_when_supplied(void** state)
 {
    gchar* account_name = g_strdup("an_account");
    char* room = "room";
--- a/tests/unittests/command/test_cmd_join.h
+++ b/tests/unittests/command/test_cmd_join.h
@@ -1,9 +1,14 @@
-void cmd_join_shows_message_when_disconnecting(void** state);
-void cmd_join_shows_message_when_connecting(void** state);
-void cmd_join_shows_message_when_disconnected(void** state);
-void cmd_join_shows_message_when_undefined(void** state);
-void cmd_join_shows_error_message_when_invalid_room_jid(void** state);
-void cmd_join_uses_account_mucservice_when_no_service_specified(void** state);
-void cmd_join_uses_supplied_nick(void** state);
-void cmd_join_uses_account_nick_when_not_supplied(void** state);
-void cmd_join_uses_password_when_supplied(void** state);
+#ifndef TESTS_TEST_CMD_JOIN_H
+#define TESTS_TEST_CMD_JOIN_H
+
+void cmd_join__shows__message_when_disconnecting(void** state);
+void cmd_join__shows__message_when_connecting(void** state);
+void cmd_join__shows__message_when_disconnected(void** state);
+void cmd_join__shows__message_when_undefined(void** state);
+void cmd_join__shows__error_message_when_invalid_room_jid(void** state);
+void cmd_join__tests__uses_account_mucservice_when_no_service_specified(void** state);
+void cmd_join__tests__uses_supplied_nick(void** state);
+void cmd_join__tests__uses_account_nick_when_not_supplied(void** state);
+void cmd_join__tests__uses_password_when_supplied(void** state);
+
+#endif
--- a/tests/unittests/command/test_cmd_otr.c
+++ b/tests/unittests/command/test_cmd_otr.c
@@ -24,7 +24,7 @@

 #ifdef HAVE_LIBOTR
 void
-cmd_otr_log_shows_usage_when_no_args(void** state)
+cmd_otr_log__shows__usage_when_no_args(void** state)
 {
    gchar* args[] = { "log", NULL };

@@ -35,7 +35,7 @@ cmd_otr_log_shows_usage_when_no_args(void** state)
 }

 void
-cmd_otr_log_shows_usage_when_invalid_subcommand(void** state)
+cmd_otr_log__shows__usage_when_invalid_subcommand(void** state)
 {
    gchar* args[] = { "log", "wrong", NULL };

@@ -46,7 +46,7 @@ cmd_otr_log_shows_usage_when_invalid_subcommand(void** state)
 }

 void
-cmd_otr_log_on_enables_logging(void** state)
+cmd_otr_log__updates__enables_logging(void** state)
 {
    gchar* args[] = { "log", "on", NULL };
    prefs_set_string(PREF_OTR_LOG, "off");
@@ -62,7 +62,7 @@ cmd_otr_log_on_enables_logging(void** state)
 }

 void
-cmd_otr_log_on_shows_warning_when_chlog_disabled(void** state)
+cmd_otr_log__shows__warning_when_chlog_disabled(void** state)
 {
    gchar* args[] = { "log", "on", NULL };
    prefs_set_string(PREF_OTR_LOG, "off");
@@ -76,7 +76,7 @@ cmd_otr_log_on_shows_warning_when_chlog_disabled(void** state)
 }

 void
-cmd_otr_log_off_disables_logging(void** state)
+cmd_otr_log__updates__disables_logging(void** state)
 {
    gchar* args[] = { "log", "off", NULL };
    prefs_set_string(PREF_OTR_LOG, "on");
@@ -92,7 +92,7 @@ cmd_otr_log_off_disables_logging(void** state)
 }

 void
-cmd_otr_redact_redacts_logging(void** state)
+cmd_otr_log__updates__redacts_logging(void** state)
 {
    gchar* args[] = { "log", "redact", NULL };
    prefs_set_string(PREF_OTR_LOG, "on");
@@ -108,7 +108,7 @@ cmd_otr_redact_redacts_logging(void** state)
 }

 void
-cmd_otr_log_redact_shows_warning_when_chlog_disabled(void** state)
+cmd_otr_log__shows__redact_warning_when_chlog_disabled(void** state)
 {
    gchar* args[] = { "log", "redact", NULL };
    prefs_set_string(PREF_OTR_LOG, "off");
@@ -122,7 +122,7 @@ cmd_otr_log_redact_shows_warning_when_chlog_disabled(void** state)
 }

 void
-cmd_otr_libver_shows_libotr_version(void** state)
+cmd_otr_libver__shows__libotr_version(void** state)
 {
    gchar* args[] = { "libver", NULL };
    char* version = "9.9.9";
@@ -140,7 +140,7 @@ cmd_otr_libver_shows_libotr_version(void** state)
 }

 void
-cmd_otr_gen_shows_message_when_not_connected(void** state)
+cmd_otr_gen__shows__message_when_not_connected(void** state)
 {
    gchar* args[] = { "gen", NULL };

@@ -167,25 +167,25 @@ test_with_command_and_connection_status(char* command, void* cmd_func, jabber_co
 }

 void
-cmd_otr_gen_shows_message_when_disconnected(void** state)
+cmd_otr_gen__shows__message_when_disconnected(void** state)
 {
    test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_DISCONNECTED);
 }

 void
-cmd_otr_gen_shows_message_when_connecting(void** state)
+cmd_otr_gen__shows__message_when_connecting(void** state)
 {
    test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_CONNECTING);
 }

 void
-cmd_otr_gen_shows_message_when_disconnecting(void** state)
+cmd_otr_gen__shows__message_when_disconnecting(void** state)
 {
    test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_DISCONNECTING);
 }

 void
-cmd_otr_gen_generates_key_for_connected_account(void** state)
+cmd_otr_gen__tests__generates_key_for_connected_account(void** state)
 {
    gchar* args[] = { "gen", NULL };
    gchar* account_name = g_strdup("myaccount");
@@ -206,25 +206,25 @@ cmd_otr_gen_generates_key_for_connected_account(void** state)
 }

 void
-cmd_otr_myfp_shows_message_when_disconnected(void** state)
+cmd_otr_myfp__shows__message_when_disconnected(void** state)
 {
    test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_DISCONNECTED);
 }

 void
-cmd_otr_myfp_shows_message_when_connecting(void** state)
+cmd_otr_myfp__shows__message_when_connecting(void** state)
 {
    test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_CONNECTING);
 }

 void
-cmd_otr_myfp_shows_message_when_disconnecting(void** state)
+cmd_otr_myfp__shows__message_when_disconnecting(void** state)
 {
    test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_DISCONNECTING);
 }

 void
-cmd_otr_myfp_shows_message_when_no_key(void** state)
+cmd_otr_myfp__shows__message_when_no_key(void** state)
 {
    gchar* args[] = { "myfp", NULL };

@@ -238,7 +238,7 @@ cmd_otr_myfp_shows_message_when_no_key(void** state)
 }

 void
-cmd_otr_myfp_shows_my_fingerprint(void** state)
+cmd_otr_myfp__shows__my_fingerprint(void** state)
 {
    char* fingerprint = "AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD EEEEEEEE";
    gchar* args[] = { "myfp", NULL };
@@ -277,25 +277,25 @@ test_cmd_otr_theirfp_from_wintype(win_type_t wintype)
 }

 void
-cmd_otr_theirfp_shows_message_when_in_console(void** state)
+cmd_otr_theirfp__shows__message_when_in_console(void** state)
 {
    test_cmd_otr_theirfp_from_wintype(WIN_CONSOLE);
 }

 void
-cmd_otr_theirfp_shows_message_when_in_muc(void** state)
+cmd_otr_theirfp__shows__message_when_in_muc(void** state)
 {
    test_cmd_otr_theirfp_from_wintype(WIN_MUC);
 }

 void
-cmd_otr_theirfp_shows_message_when_in_private(void** state)
+cmd_otr_theirfp__shows__message_when_in_private(void** state)
 {
    test_cmd_otr_theirfp_from_wintype(WIN_PRIVATE);
 }

 void
-cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void** state)
+cmd_otr_theirfp__shows__message_when_non_otr_chat_window(void** state)
 {
    gchar* args[] = { "theirfp", NULL };

@@ -320,7 +320,7 @@ cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void** state)
 }

 void
-cmd_otr_theirfp_shows_fingerprint(void** state)
+cmd_otr_theirfp__shows__fingerprint(void** state)
 {
    char* recipient = "someone@chat.com";
    char* fingerprint = "AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD EEEEEEEE";
@@ -373,25 +373,25 @@ test_cmd_otr_start_from_wintype(win_type_t wintype)
 }

 void
-cmd_otr_start_shows_message_when_in_console(void** state)
+cmd_otr_start__shows__message_when_in_console(void** state)
 {
    test_cmd_otr_start_from_wintype(WIN_CONSOLE);
 }

 void
-cmd_otr_start_shows_message_when_in_muc(void** state)
+cmd_otr_start__shows__message_when_in_muc(void** state)
 {
    test_cmd_otr_start_from_wintype(WIN_MUC);
 }

 void
-cmd_otr_start_shows_message_when_in_private(void** state)
+cmd_otr_start__shows__message_when_in_private(void** state)
 {
    test_cmd_otr_start_from_wintype(WIN_PRIVATE);
 }

 void
-cmd_otr_start_shows_message_when_already_started(void** state)
+cmd_otr_start__shows__message_when_already_started(void** state)
 {
    char* recipient = "someone@server.org";
    gchar* args[] = { "start", NULL };
@@ -417,7 +417,7 @@ cmd_otr_start_shows_message_when_already_started(void** state)
 }

 void
-cmd_otr_start_shows_message_when_no_key(void** state)
+cmd_otr_start__shows__message_when_no_key(void** state)
 {
    char* recipient = "someone@server.org";
    gchar* args[] = { "start", NULL };
@@ -444,7 +444,7 @@ cmd_otr_start_shows_message_when_no_key(void** state)
 }

 void
-cmd_otr_start_sends_otr_query_message_to_current_recipeint(void** state)
+cmd_otr_start__tests__sends_otr_query_message_to_current_recipeint(void** state)
 {
    char* recipient = "buddy@chat.com";
    char* query_message = "?OTR?";
@@ -475,7 +475,7 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void** state)

 #else
 void
-cmd_otr_shows_message_when_otr_unsupported(void** state)
+cmd_otr__shows__message_when_otr_unsupported(void** state)
 {
    gchar* args[] = { "gen", NULL };

--- a/tests/unittests/command/test_cmd_otr.h
+++ b/tests/unittests/command/test_cmd_otr.h
@@ -1,37 +1,42 @@
+#ifndef TESTS_TEST_CMD_OTR_H
+#define TESTS_TEST_CMD_OTR_H
+
 #include "config.h"

 #ifdef HAVE_LIBOTR
-void cmd_otr_log_shows_usage_when_no_args(void** state);
-void cmd_otr_log_shows_usage_when_invalid_subcommand(void** state);
-void cmd_otr_log_on_enables_logging(void** state);
-void cmd_otr_log_off_disables_logging(void** state);
-void cmd_otr_redact_redacts_logging(void** state);
-void cmd_otr_log_on_shows_warning_when_chlog_disabled(void** state);
-void cmd_otr_log_redact_shows_warning_when_chlog_disabled(void** state);
-void cmd_otr_libver_shows_libotr_version(void** state);
-void cmd_otr_gen_shows_message_when_not_connected(void** state);
-void cmd_otr_gen_generates_key_for_connected_account(void** state);
-void cmd_otr_gen_shows_message_when_disconnected(void** state);
-void cmd_otr_gen_shows_message_when_undefined(void** state);
-void cmd_otr_gen_shows_message_when_connecting(void** state);
-void cmd_otr_gen_shows_message_when_disconnecting(void** state);
-void cmd_otr_myfp_shows_message_when_disconnected(void** state);
-void cmd_otr_myfp_shows_message_when_undefined(void** state);
-void cmd_otr_myfp_shows_message_when_connecting(void** state);
-void cmd_otr_myfp_shows_message_when_disconnecting(void** state);
-void cmd_otr_myfp_shows_message_when_no_key(void** state);
-void cmd_otr_myfp_shows_my_fingerprint(void** state);
-void cmd_otr_theirfp_shows_message_when_in_console(void** state);
-void cmd_otr_theirfp_shows_message_when_in_muc(void** state);
-void cmd_otr_theirfp_shows_message_when_in_private(void** state);
-void cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void** state);
-void cmd_otr_theirfp_shows_fingerprint(void** state);
-void cmd_otr_start_shows_message_when_in_console(void** state);
-void cmd_otr_start_shows_message_when_in_muc(void** state);
-void cmd_otr_start_shows_message_when_in_private(void** state);
-void cmd_otr_start_shows_message_when_already_started(void** state);
-void cmd_otr_start_shows_message_when_no_key(void** state);
-void cmd_otr_start_sends_otr_query_message_to_current_recipeint(void** state);
+void cmd_otr_log__shows__usage_when_no_args(void** state);
+void cmd_otr_log__shows__usage_when_invalid_subcommand(void** state);
+void cmd_otr_log__updates__enables_logging(void** state);
+void cmd_otr_log__updates__disables_logging(void** state);
+void cmd_otr_log__updates__redacts_logging(void** state);
+void cmd_otr_log__shows__warning_when_chlog_disabled(void** state);
+void cmd_otr_log__shows__redact_warning_when_chlog_disabled(void** state);
+void cmd_otr_libver__shows__libotr_version(void** state);
+void cmd_otr_gen__shows__message_when_not_connected(void** state);
+void cmd_otr_gen__tests__generates_key_for_connected_account(void** state);
+void cmd_otr_gen__shows__message_when_disconnected(void** state);
+void cmd_otr_gen__shows__message_when_undefined(void** state);
+void cmd_otr_gen__shows__message_when_connecting(void** state);
+void cmd_otr_gen__shows__message_when_disconnecting(void** state);
+void cmd_otr_myfp__shows__message_when_disconnected(void** state);
+void cmd_otr_myfp__shows__message_when_undefined(void** state);
+void cmd_otr_myfp__shows__message_when_connecting(void** state);
+void cmd_otr_myfp__shows__message_when_disconnecting(void** state);
+void cmd_otr_myfp__shows__message_when_no_key(void** state);
+void cmd_otr_myfp__shows__my_fingerprint(void** state);
+void cmd_otr_theirfp__shows__message_when_in_console(void** state);
+void cmd_otr_theirfp__shows__message_when_in_muc(void** state);
+void cmd_otr_theirfp__shows__message_when_in_private(void** state);
+void cmd_otr_theirfp__shows__message_when_non_otr_chat_window(void** state);
+void cmd_otr_theirfp__shows__fingerprint(void** state);
+void cmd_otr_start__shows__message_when_in_console(void** state);
+void cmd_otr_start__shows__message_when_in_muc(void** state);
+void cmd_otr_start__shows__message_when_in_private(void** state);
+void cmd_otr_start__shows__message_when_already_started(void** state);
+void cmd_otr_start__shows__message_when_no_key(void** state);
+void cmd_otr_start__tests__sends_otr_query_message_to_current_recipeint(void** state);
 #else
-void cmd_otr_shows_message_when_otr_unsupported(void** state);
+void cmd_otr__shows__message_when_otr_unsupported(void** state);
+#endif
+
 #endif
--- a/tests/unittests/command/test_cmd_pgp.c
+++ b/tests/unittests/command/test_cmd_pgp.c
@@ -14,7 +14,7 @@

 #ifdef HAVE_LIBGPGME
 void
-cmd_pgp_shows_usage_when_no_args(void** state)
+cmd_pgp__shows__usage_when_no_args(void** state)
 {
    gchar* args[] = { NULL };

@@ -25,7 +25,7 @@ cmd_pgp_shows_usage_when_no_args(void** state)
 }

 void
-cmd_pgp_start_shows_message_when_connection(jabber_conn_status_t conn_status)
+cmd_pgp_start__shows__message_when_connection(jabber_conn_status_t conn_status)
 {
    gchar* args[] = { "start", NULL };
    ProfWin window;
@@ -40,25 +40,25 @@ cmd_pgp_start_shows_message_when_connection(jabber_conn_status_t conn_status)
 }

 void
-cmd_pgp_start_shows_message_when_disconnected(void** state)
+cmd_pgp_start__shows__message_when_disconnected(void** state)
 {
-    cmd_pgp_start_shows_message_when_connection(JABBER_DISCONNECTED);
+    cmd_pgp_start__shows__message_when_connection(JABBER_DISCONNECTED);
 }

 void
-cmd_pgp_start_shows_message_when_disconnecting(void** state)
+cmd_pgp_start__shows__message_when_disconnecting(void** state)
 {
-    cmd_pgp_start_shows_message_when_connection(JABBER_DISCONNECTING);
+    cmd_pgp_start__shows__message_when_connection(JABBER_DISCONNECTING);
 }

 void
-cmd_pgp_start_shows_message_when_connecting(void** state)
+cmd_pgp_start__shows__message_when_connecting(void** state)
 {
-    cmd_pgp_start_shows_message_when_connection(JABBER_CONNECTING);
+    cmd_pgp_start__shows__message_when_connection(JABBER_CONNECTING);
 }

 void
-cmd_pgp_start_shows_message_when_no_arg_in_wintype(win_type_t wintype)
+cmd_pgp_start__shows__message_when_no_arg_in_wintype(win_type_t wintype)
 {
    gchar* args[] = { "start", NULL };
    ProfWin window;
@@ -73,38 +73,38 @@ cmd_pgp_start_shows_message_when_no_arg_in_wintype(win_type_t wintype)
 }

 void
-cmd_pgp_start_shows_message_when_no_arg_in_console(void** state)
+cmd_pgp_start__shows__message_when_no_arg_in_console(void** state)
 {
-    cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_CONSOLE);
+    cmd_pgp_start__shows__message_when_no_arg_in_wintype(WIN_CONSOLE);
 }

 void
-cmd_pgp_start_shows_message_when_no_arg_in_muc(void** state)
+cmd_pgp_start__shows__message_when_no_arg_in_muc(void** state)
 {
-    cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_MUC);
+    cmd_pgp_start__shows__message_when_no_arg_in_wintype(WIN_MUC);
 }

 void
-cmd_pgp_start_shows_message_when_no_arg_in_conf(void** state)
+cmd_pgp_start__shows__message_when_no_arg_in_conf(void** state)
 {
-    cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_CONFIG);
+    cmd_pgp_start__shows__message_when_no_arg_in_wintype(WIN_CONFIG);
 }

 void
-cmd_pgp_start_shows_message_when_no_arg_in_private(void** state)
+cmd_pgp_start__shows__message_when_no_arg_in_private(void** state)
 {
-    cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_PRIVATE);
+    cmd_pgp_start__shows__message_when_no_arg_in_wintype(WIN_PRIVATE);
 }

 void
-cmd_pgp_start_shows_message_when_no_arg_in_xmlconsole(void** state)
+cmd_pgp_start__shows__message_when_no_arg_in_xmlconsole(void** state)
 {
-    cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_XML);
+    cmd_pgp_start__shows__message_when_no_arg_in_wintype(WIN_XML);
 }

 #else
 void
-cmd_pgp_shows_message_when_pgp_unsupported(void** state)
+cmd_pgp__shows__message_when_pgp_unsupported(void** state)
 {
    gchar* args[] = { "gen", NULL };

--- a/tests/unittests/command/test_cmd_pgp.h
+++ b/tests/unittests/command/test_cmd_pgp.h
@@ -1,16 +1,21 @@
+#ifndef TESTS_TEST_CMD_PGP_H
+#define TESTS_TEST_CMD_PGP_H
+
 #include "config.h"

 #ifdef HAVE_LIBGPGME
-void cmd_pgp_shows_usage_when_no_args(void** state);
-void cmd_pgp_start_shows_message_when_disconnected(void** state);
-void cmd_pgp_start_shows_message_when_disconnecting(void** state);
-void cmd_pgp_start_shows_message_when_connecting(void** state);
-void cmd_pgp_start_shows_message_when_undefined(void** state);
-void cmd_pgp_start_shows_message_when_no_arg_in_console(void** state);
-void cmd_pgp_start_shows_message_when_no_arg_in_muc(void** state);
-void cmd_pgp_start_shows_message_when_no_arg_in_conf(void** state);
-void cmd_pgp_start_shows_message_when_no_arg_in_private(void** state);
-void cmd_pgp_start_shows_message_when_no_arg_in_xmlconsole(void** state);
+void cmd_pgp__shows__usage_when_no_args(void** state);
+void cmd_pgp_start__shows__message_when_disconnected(void** state);
+void cmd_pgp_start__shows__message_when_disconnecting(void** state);
+void cmd_pgp_start__shows__message_when_connecting(void** state);
+void cmd_pgp_start__shows__message_when_undefined(void** state);
+void cmd_pgp_start__shows__message_when_no_arg_in_console(void** state);
+void cmd_pgp_start__shows__message_when_no_arg_in_muc(void** state);
+void cmd_pgp_start__shows__message_when_no_arg_in_conf(void** state);
+void cmd_pgp_start__shows__message_when_no_arg_in_private(void** state);
+void cmd_pgp_start__shows__message_when_no_arg_in_xmlconsole(void** state);
 #else
-void cmd_pgp_shows_message_when_pgp_unsupported(void** state);
+void cmd_pgp__shows__message_when_pgp_unsupported(void** state);
+#endif
+
 #endif
--- a/tests/unittests/command/test_cmd_presence.c
+++ b/tests/unittests/command/test_cmd_presence.c
@@ -13,7 +13,7 @@
 #define CMD_PRESENCE "/presence"

 void
-cmd_presence_shows_usage_when_bad_subcmd(void** state)
+cmd_presence__shows__usage_when_bad_subcmd(void** state)
 {
    gchar* args[] = { "badcmd", NULL };

@@ -24,7 +24,7 @@ cmd_presence_shows_usage_when_bad_subcmd(void** state)
 }

 void
-cmd_presence_shows_usage_when_bad_console_setting(void** state)
+cmd_presence__shows__usage_when_bad_console_setting(void** state)
 {
    gchar* args[] = { "console", "badsetting", NULL };

@@ -35,7 +35,7 @@ cmd_presence_shows_usage_when_bad_console_setting(void** state)
 }

 void
-cmd_presence_shows_usage_when_bad_chat_setting(void** state)
+cmd_presence__shows__usage_when_bad_chat_setting(void** state)
 {
    gchar* args[] = { "chat", "badsetting", NULL };

@@ -46,7 +46,7 @@ cmd_presence_shows_usage_when_bad_chat_setting(void** state)
 }

 void
-cmd_presence_shows_usage_when_bad_muc_setting(void** state)
+cmd_presence__shows__usage_when_bad_muc_setting(void** state)
 {
    gchar* args[] = { "muc", "badsetting", NULL };

@@ -57,7 +57,7 @@ cmd_presence_shows_usage_when_bad_muc_setting(void** state)
 }

 void
-cmd_presence_console_sets_all(void** state)
+cmd_presence__updates__console_all(void** state)
 {
    gchar* args[] = { "console", "all", NULL };

@@ -72,7 +72,7 @@ cmd_presence_console_sets_all(void** state)
 }

 void
-cmd_presence_console_sets_online(void** state)
+cmd_presence__updates__console_online(void** state)
 {
    gchar* args[] = { "console", "online", NULL };

@@ -87,7 +87,7 @@ cmd_presence_console_sets_online(void** state)
 }

 void
-cmd_presence_console_sets_none(void** state)
+cmd_presence__updates__console_none(void** state)
 {
    gchar* args[] = { "console", "none", NULL };

@@ -102,7 +102,7 @@ cmd_presence_console_sets_none(void** state)
 }

 void
-cmd_presence_chat_sets_all(void** state)
+cmd_presence__updates__chat_all(void** state)
 {
    gchar* args[] = { "chat", "all", NULL };

@@ -117,7 +117,7 @@ cmd_presence_chat_sets_all(void** state)
 }

 void
-cmd_presence_chat_sets_online(void** state)
+cmd_presence__updates__chat_online(void** state)
 {
    gchar* args[] = { "chat", "online", NULL };

@@ -132,7 +132,7 @@ cmd_presence_chat_sets_online(void** state)
 }

 void
-cmd_presence_chat_sets_none(void** state)
+cmd_presence__updates__chat_none(void** state)
 {
    gchar* args[] = { "chat", "none", NULL };

@@ -147,7 +147,7 @@ cmd_presence_chat_sets_none(void** state)
 }

 void
-cmd_presence_room_sets_all(void** state)
+cmd_presence__updates__room_all(void** state)
 {
    gchar* args[] = { "room", "all", NULL };

@@ -162,7 +162,7 @@ cmd_presence_room_sets_all(void** state)
 }

 void
-cmd_presence_room_sets_online(void** state)
+cmd_presence__updates__room_online(void** state)
 {
    gchar* args[] = { "room", "online", NULL };

@@ -177,7 +177,7 @@ cmd_presence_room_sets_online(void** state)
 }

 void
-cmd_presence_room_sets_none(void** state)
+cmd_presence__updates__room_none(void** state)
 {
    gchar* args[] = { "room", "none", NULL };

--- a/tests/unittests/command/test_cmd_presence.h
+++ b/tests/unittests/command/test_cmd_presence.h
@@ -1,13 +1,18 @@
-void cmd_presence_shows_usage_when_bad_subcmd(void** state);
-void cmd_presence_shows_usage_when_bad_console_setting(void** state);
-void cmd_presence_shows_usage_when_bad_chat_setting(void** state);
-void cmd_presence_shows_usage_when_bad_muc_setting(void** state);
-void cmd_presence_console_sets_all(void** state);
-void cmd_presence_console_sets_online(void** state);
-void cmd_presence_console_sets_none(void** state);
-void cmd_presence_chat_sets_all(void** state);
-void cmd_presence_chat_sets_online(void** state);
-void cmd_presence_chat_sets_none(void** state);
-void cmd_presence_room_sets_all(void** state);
-void cmd_presence_room_sets_online(void** state);
-void cmd_presence_room_sets_none(void** state);
+#ifndef TESTS_TEST_CMD_PRESENCE_H
+#define TESTS_TEST_CMD_PRESENCE_H
+
+void cmd_presence__shows__usage_when_bad_subcmd(void** state);
+void cmd_presence__shows__usage_when_bad_console_setting(void** state);
+void cmd_presence__shows__usage_when_bad_chat_setting(void** state);
+void cmd_presence__shows__usage_when_bad_muc_setting(void** state);
+void cmd_presence__updates__console_all(void** state);
+void cmd_presence__updates__console_online(void** state);
+void cmd_presence__updates__console_none(void** state);
+void cmd_presence__updates__chat_all(void** state);
+void cmd_presence__updates__chat_online(void** state);
+void cmd_presence__updates__chat_none(void** state);
+void cmd_presence__updates__room_all(void** state);
+void cmd_presence__updates__room_online(void** state);
+void cmd_presence__updates__room_none(void** state);
+
+#endif
--- a/tests/unittests/command/test_cmd_rooms.c
+++ b/tests/unittests/command/test_cmd_rooms.c
@@ -25,25 +25,25 @@ test_with_connection_status(jabber_conn_status_t status)
 }

 void
-cmd_rooms_shows_message_when_disconnected(void** state)
+cmd_rooms__shows__message_when_disconnected(void** state)
 {
    test_with_connection_status(JABBER_DISCONNECTED);
 }

 void
-cmd_rooms_shows_message_when_disconnecting(void** state)
+cmd_rooms__shows__message_when_disconnecting(void** state)
 {
    test_with_connection_status(JABBER_DISCONNECTING);
 }

 void
-cmd_rooms_shows_message_when_connecting(void** state)
+cmd_rooms__shows__message_when_connecting(void** state)
 {
    test_with_connection_status(JABBER_CONNECTING);
 }

 void
-cmd_rooms_uses_account_default_when_no_arg(void** state)
+cmd_rooms__tests__account_default_when_no_arg(void** state)
 {
    gchar* args[] = { NULL };

@@ -66,7 +66,7 @@ cmd_rooms_uses_account_default_when_no_arg(void** state)
 }

 void
-cmd_rooms_service_arg_used_when_passed(void** state)
+cmd_rooms__tests__service_arg_used_when_passed(void** state)
 {
    gchar* args[] = { "service", "conf_server_arg", NULL };

@@ -83,7 +83,7 @@ cmd_rooms_service_arg_used_when_passed(void** state)
 }

 void
-cmd_rooms_filter_arg_used_when_passed(void** state)
+cmd_rooms__tests__filter_arg_used_when_passed(void** state)
 {
    gchar* args[] = { "filter", "text", NULL };

--- a/tests/unittests/command/test_cmd_rooms.h
+++ b/tests/unittests/command/test_cmd_rooms.h
@@ -1,7 +1,12 @@
-void cmd_rooms_shows_message_when_disconnected(void** state);
-void cmd_rooms_shows_message_when_disconnecting(void** state);
-void cmd_rooms_shows_message_when_connecting(void** state);
-void cmd_rooms_shows_message_when_undefined(void** state);
-void cmd_rooms_uses_account_default_when_no_arg(void** state);
-void cmd_rooms_service_arg_used_when_passed(void** state);
-void cmd_rooms_filter_arg_used_when_passed(void** state);
+#ifndef TESTS_TEST_CMD_ROOMS_H
+#define TESTS_TEST_CMD_ROOMS_H
+
+void cmd_rooms__shows__message_when_disconnected(void** state);
+void cmd_rooms__shows__message_when_disconnecting(void** state);
+void cmd_rooms__shows__message_when_connecting(void** state);
+void cmd_rooms__shows__message_when_undefined(void** state);
+void cmd_rooms__tests__account_default_when_no_arg(void** state);
+void cmd_rooms__tests__service_arg_used_when_passed(void** state);
+void cmd_rooms__tests__filter_arg_used_when_passed(void** state);
+
+#endif
--- a/tests/unittests/command/test_cmd_roster.c
+++ b/tests/unittests/command/test_cmd_roster.c
@@ -26,25 +26,25 @@ test_with_connection_status(jabber_conn_status_t status)
 }

 void
-cmd_roster_shows_message_when_disconnecting(void** state)
+cmd_roster__shows__message_when_disconnecting(void** state)
 {
    test_with_connection_status(JABBER_DISCONNECTING);
 }

 void
-cmd_roster_shows_message_when_connecting(void** state)
+cmd_roster__shows__message_when_connecting(void** state)
 {
    test_with_connection_status(JABBER_CONNECTING);
 }

 void
-cmd_roster_shows_message_when_disconnected(void** state)
+cmd_roster__shows__message_when_disconnected(void** state)
 {
    test_with_connection_status(JABBER_DISCONNECTED);
 }

 void
-cmd_roster_shows_roster_when_no_args(void** state)
+cmd_roster__shows__roster_when_no_args(void** state)
 {
    gchar* args[] = { NULL };

@@ -64,7 +64,7 @@ cmd_roster_shows_roster_when_no_args(void** state)
 }

 void
-cmd_roster_add_shows_message_when_no_jid(void** state)
+cmd_roster__shows__message_when_add_no_jid(void** state)
 {
    gchar* args[] = { "add", NULL };

@@ -77,7 +77,7 @@ cmd_roster_add_shows_message_when_no_jid(void** state)
 }

 void
-cmd_roster_add_sends_roster_add_request(void** state)
+cmd_roster__tests__add_sends_roster_add_request(void** state)
 {
    char* jid = "bob@server.org";
    char* nick = "bob";
@@ -93,7 +93,7 @@ cmd_roster_add_sends_roster_add_request(void** state)
 }

 void
-cmd_roster_remove_shows_message_when_no_jid(void** state)
+cmd_roster__shows__message_when_remove_no_jid(void** state)
 {
    gchar* args[] = { "remove", NULL };

@@ -106,7 +106,7 @@ cmd_roster_remove_shows_message_when_no_jid(void** state)
 }

 void
-cmd_roster_remove_sends_roster_remove_request(void** state)
+cmd_roster__tests__remove_sends_roster_remove_request(void** state)
 {
    char* jid = "bob@server.org";
    gchar* args[] = { "remove", jid, NULL };
@@ -124,13 +124,14 @@ cmd_roster_remove_sends_roster_remove_request(void** state)
 }

 void
-cmd_roster_remove_nickname_sends_roster_remove_request(void** state)
+cmd_roster__tests__remove_nickname_sends_roster_remove_request(void** state)
 {
    char* jid = "bob@server.org";
-    gchar* args[] = { "remove", "bob", NULL };
+    char* nick = "bob";
+    gchar* args[] = { "remove", nick, NULL };

    roster_create();
-    roster_add("bob@server.org", "bob", NULL, "both", FALSE);
+    roster_add(jid, nick, NULL, "both", FALSE);

    will_return(connection_get_status, JABBER_CONNECTED);

@@ -142,7 +143,7 @@ cmd_roster_remove_nickname_sends_roster_remove_request(void** state)
 }

 void
-cmd_roster_nick_shows_message_when_no_jid(void** state)
+cmd_roster__shows__message_when_nick_no_jid(void** state)
 {
    gchar* args[] = { "nick", NULL };

@@ -155,7 +156,7 @@ cmd_roster_nick_shows_message_when_no_jid(void** state)
 }

 void
-cmd_roster_nick_shows_message_when_no_nick(void** state)
+cmd_roster__shows__message_when_nick_no_nick(void** state)
 {
    gchar* args[] = { "nick", "bob@server.org", NULL };

@@ -168,7 +169,7 @@ cmd_roster_nick_shows_message_when_no_nick(void** state)
 }

 void
-cmd_roster_nick_shows_message_when_no_contact_exists(void** state)
+cmd_roster__shows__message_when_nick_no_contact_exists(void** state)
 {
    gchar* args[] = { "nick", "bob@server.org", "bobster", NULL };

@@ -185,7 +186,7 @@ cmd_roster_nick_shows_message_when_no_contact_exists(void** state)
 }

 void
-cmd_roster_nick_sends_name_change_request(void** state)
+cmd_roster__tests__nick_sends_name_change_request(void** state)
 {
    char* jid = "bob@server.org";
    char* nick = "bobster";
@@ -214,7 +215,7 @@ cmd_roster_nick_sends_name_change_request(void** state)
 }

 void
-cmd_roster_clearnick_shows_message_when_no_jid(void** state)
+cmd_roster__shows__message_when_clearnick_no_jid(void** state)
 {
    gchar* args[] = { "clearnick", NULL };

@@ -227,7 +228,7 @@ cmd_roster_clearnick_shows_message_when_no_jid(void** state)
 }

 void
-cmd_roster_clearnick_shows_message_when_no_contact_exists(void** state)
+cmd_roster__shows__message_when_clearnick_no_contact_exists(void** state)
 {
    gchar* args[] = { "clearnick", "bob@server.org", NULL };

@@ -244,7 +245,7 @@ cmd_roster_clearnick_shows_message_when_no_contact_exists(void** state)
 }

 void
-cmd_roster_clearnick_sends_name_change_request_with_empty_nick(void** state)
+cmd_roster__tests__clearnick_sends_name_change_request_with_empty_nick(void** state)
 {
    char* jid = "bob@server.org";
    gchar* args[] = { "clearnick", jid, NULL };
--- a/tests/unittests/command/test_cmd_roster.h
+++ b/tests/unittests/command/test_cmd_roster.h
@@ -1,17 +1,21 @@
-void cmd_roster_shows_message_when_disconnecting(void** state);
-void cmd_roster_shows_message_when_connecting(void** state);
-void cmd_roster_shows_message_when_disconnected(void** state);
-void cmd_roster_shows_message_when_undefined(void** state);
-void cmd_roster_shows_roster_when_no_args(void** state);
-void cmd_roster_add_shows_message_when_no_jid(void** state);
-void cmd_roster_add_sends_roster_add_request(void** state);
-void cmd_roster_remove_shows_message_when_no_jid(void** state);
-void cmd_roster_remove_sends_roster_remove_request(void** state);
-void cmd_roster_remove_nickname_sends_roster_remove_request(void** state);
-void cmd_roster_nick_shows_message_when_no_jid(void** state);
-void cmd_roster_nick_shows_message_when_no_nick(void** state);
-void cmd_roster_nick_shows_message_when_no_contact_exists(void** state);
-void cmd_roster_nick_sends_name_change_request(void** state);
-void cmd_roster_clearnick_shows_message_when_no_jid(void** state);
-void cmd_roster_clearnick_shows_message_when_no_contact_exists(void** state);
-void cmd_roster_clearnick_sends_name_change_request_with_empty_nick(void** state);
+#ifndef TESTS_TEST_CMD_ROSTER_H
+#define TESTS_TEST_CMD_ROSTER_H
+
+void cmd_roster__shows__message_when_disconnecting(void** state);
+void cmd_roster__shows__message_when_connecting(void** state);
+void cmd_roster__shows__message_when_disconnected(void** state);
+void cmd_roster__shows__roster_when_no_args(void** state);
+void cmd_roster__shows__message_when_add_no_jid(void** state);
+void cmd_roster__tests__add_sends_roster_add_request(void** state);
+void cmd_roster__shows__message_when_remove_no_jid(void** state);
+void cmd_roster__tests__remove_sends_roster_remove_request(void** state);
+void cmd_roster__tests__remove_nickname_sends_roster_remove_request(void** state);
+void cmd_roster__shows__message_when_nick_no_jid(void** state);
+void cmd_roster__shows__message_when_nick_no_nick(void** state);
+void cmd_roster__shows__message_when_nick_no_contact_exists(void** state);
+void cmd_roster__tests__nick_sends_name_change_request(void** state);
+void cmd_roster__shows__message_when_clearnick_no_jid(void** state);
+void cmd_roster__shows__message_when_clearnick_no_contact_exists(void** state);
+void cmd_roster__tests__clearnick_sends_name_change_request_with_empty_nick(void** state);
+
+#endif
--- a/tests/unittests/command/test_cmd_sub.c
+++ b/tests/unittests/command/test_cmd_sub.c
@@ -13,7 +13,7 @@
 #define CMD_SUB "/sub"

 void
-cmd_sub_shows_message_when_not_connected(void** state)
+cmd_sub__shows__message_when_not_connected(void** state)
 {
    gchar* args[] = { NULL };

@@ -26,7 +26,7 @@ cmd_sub_shows_message_when_not_connected(void** state)
 }

 void
-cmd_sub_shows_usage_when_no_arg(void** state)
+cmd_sub__shows__usage_when_no_arg(void** state)
 {
    gchar* args[] = { NULL };

--- a/tests/unittests/command/test_cmd_sub.h
+++ b/tests/unittests/command/test_cmd_sub.h
@@ -1,2 +1,7 @@
-void cmd_sub_shows_message_when_not_connected(void** state);
-void cmd_sub_shows_usage_when_no_arg(void** state);
+#ifndef TESTS_TEST_CMD_SUB_H
+#define TESTS_TEST_CMD_SUB_H
+
+void cmd_sub__shows__message_when_not_connected(void** state);
+void cmd_sub__shows__usage_when_no_arg(void** state);
+
+#endif