diff --git a/src/tests/settingsadhoccommand.cpp b/src/tests/settingsadhoccommand.cpp
index f0b8f6e39e6c89958adf5bce705a5e09801db832..c69ef923b5ccbf20182ab20a53d67e9a267c00df 100644
--- a/src/tests/settingsadhoccommand.cpp
+++ b/src/tests/settingsadhoccommand.cpp
@@ -27,6 +27,8 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT
 	CPPUNIT_TEST_SUITE(SettingsAdHocCommandTest);
 	CPPUNIT_TEST(getItems);
 	CPPUNIT_TEST(execute);
+	CPPUNIT_TEST(executeBadSessionID);
+	CPPUNIT_TEST(cancel);
 	CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -73,6 +75,113 @@ class SettingsAdHocCommandTest : public CPPUNIT_NS :: TestFixture, public BasicT
 			iq->setFrom("user@localhost");
 			injectIQ(iq);
 			loop->processEvents();
+
+			CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
+
+			CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
+			CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
+
+			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>());
+			CPPUNIT_ASSERT_EQUAL(std::string("settings"), getStanza(received[0])->getPayload<Swift::Command>()->getNode());
+			CPPUNIT_ASSERT_EQUAL(Swift::Command::Executing, getStanza(received[0])->getPayload<Swift::Command>()->getStatus());
+
+			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm());
+
+			std::string sessionId = getStanza(received[0])->getPayload<Swift::Command>()->getSessionID();
+
+			// finish the command
+			payload = boost::shared_ptr<Swift::Command>(new Swift::Command("settings"));
+			payload->setSessionID(sessionId);
+			payload->setForm(getStanza(received[0])->getPayload<Swift::Command>()->getForm());
+			iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload);
+			iq->setFrom("user@localhost");
+			received.clear();
+			injectIQ(iq);
+			loop->processEvents();
+
+			CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
+
+			CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
+			CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
+
+			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>());
+			CPPUNIT_ASSERT_EQUAL(std::string("settings"), getStanza(received[0])->getPayload<Swift::Command>()->getNode());
+			CPPUNIT_ASSERT_EQUAL(Swift::Command::Completed, getStanza(received[0])->getPayload<Swift::Command>()->getStatus());
+		}
+
+		void executeBadSessionID() {
+			boost::shared_ptr<Swift::Command> payload(new Swift::Command("settings"));
+			boost::shared_ptr<Swift::IQ> iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload);
+			iq->setFrom("user@localhost");
+			injectIQ(iq);
+			loop->processEvents();
+
+			CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
+
+			CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
+			CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
+
+			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>());
+			CPPUNIT_ASSERT_EQUAL(std::string("settings"), getStanza(received[0])->getPayload<Swift::Command>()->getNode());
+			CPPUNIT_ASSERT_EQUAL(Swift::Command::Executing, getStanza(received[0])->getPayload<Swift::Command>()->getStatus());
+
+			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm());
+
+			std::string sessionId = "somethingwrong";
+
+			// finish the command
+			payload = boost::shared_ptr<Swift::Command>(new Swift::Command("settings"));
+			payload->setSessionID(sessionId);
+			payload->setForm(getStanza(received[0])->getPayload<Swift::Command>()->getForm());
+			iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload);
+			iq->setFrom("user@localhost");
+			received.clear();
+			injectIQ(iq);
+			loop->processEvents();
+
+			CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
+			CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
+			CPPUNIT_ASSERT_EQUAL(Swift::IQ::Error, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
+		}
+
+		void cancel() {
+			boost::shared_ptr<Swift::Command> payload(new Swift::Command("settings"));
+			boost::shared_ptr<Swift::IQ> iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload);
+			iq->setFrom("user@localhost");
+			injectIQ(iq);
+			loop->processEvents();
+
+			CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
+
+			CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
+			CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
+
+			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>());
+			CPPUNIT_ASSERT_EQUAL(std::string("settings"), getStanza(received[0])->getPayload<Swift::Command>()->getNode());
+			CPPUNIT_ASSERT_EQUAL(Swift::Command::Executing, getStanza(received[0])->getPayload<Swift::Command>()->getStatus());
+
+			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>()->getForm());
+
+			std::string sessionId = getStanza(received[0])->getPayload<Swift::Command>()->getSessionID();
+
+			// cancel the command
+			payload = boost::shared_ptr<Swift::Command>(new Swift::Command("settings"));
+			payload->setSessionID(sessionId);
+			payload->setAction(Swift::Command::Cancel);
+			iq = Swift::IQ::createRequest(Swift::IQ::Set, Swift::JID("localhost"), "id", payload);
+			iq->setFrom("user@localhost");
+			received.clear();
+			injectIQ(iq);
+			loop->processEvents();
+
+			CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
+
+			CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));
+			CPPUNIT_ASSERT_EQUAL(Swift::IQ::Result, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());
+
+			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Command>());
+			CPPUNIT_ASSERT_EQUAL(std::string("settings"), getStanza(received[0])->getPayload<Swift::Command>()->getNode());
+			CPPUNIT_ASSERT_EQUAL(Swift::Command::Canceled, getStanza(received[0])->getPayload<Swift::Command>()->getStatus());
 		}
 
 };