diff --git a/test/README b/test/README
new file mode 100644
index 0000000000000000000000000000000000000000..d090ea2cea1700e290c7f42e1e7da091b3ac4f47
--- /dev/null
+++ b/test/README
@@ -0,0 +1 @@
+The daemon has to be recompiled before compiling the unitary tests.
diff --git a/test/numbercleanerTest.cpp b/test/numbercleanerTest.cpp
index 89702ef0d29c595ebe9f6e09270c7dd286b85e72..f6c9a22d8048d1ae2058af8db11f19d6f6363391 100644
--- a/test/numbercleanerTest.cpp
+++ b/test/numbercleanerTest.cpp
@@ -32,9 +32,11 @@
 #define NUMBER_TEST_7   "ext 136"
 #define NUMBER_TEST_8   "514 333  4444 ext. 136"
 #define NUMBER_TEST_9   "514 333  4444 ext 136"
+#define NUMBER_TEST_10   "136"
 
 #define VALID_NUMBER                "5143334444"
 #define VALID_PREPENDED_NUMBER      "95143334444"
+#define VALID_EXTENSION             "136"
 
 using std::cout;
 using std::endl;
@@ -97,6 +99,12 @@ void NumberCleanerTest::test_format_10 (void) {
     CPPUNIT_ASSERT (cleaner->clean (NUMBER_TEST_1) == VALID_PREPENDED_NUMBER);
 }
 
+void NumberCleanerTest::test_format_11 (void) {
+
+    cleaner->set_phone_number_prefix ("9");
+    CPPUNIT_ASSERT (cleaner->get_phone_number_prefix () == "9");
+    CPPUNIT_ASSERT (cleaner->clean (NUMBER_TEST_10) == VALID_EXTENSION);
+}
 void NumberCleanerTest::tearDown(){
     // Delete the cleaner object
     delete cleaner; cleaner=0;
diff --git a/test/numbercleanerTest.h b/test/numbercleanerTest.h
index b840588a5618e45f6157e53e27def2dd3dac1a94..3152892a0053bcbb43b4e347933bc1bb576b2bca 100644
--- a/test/numbercleanerTest.h
+++ b/test/numbercleanerTest.h
@@ -52,6 +52,7 @@ class NumberCleanerTest : public CppUnit::TestCase {
         CPPUNIT_TEST (test_format_8);
         CPPUNIT_TEST (test_format_9);
         CPPUNIT_TEST (test_format_10);
+        CPPUNIT_TEST (test_format_11);
     CPPUNIT_TEST_SUITE_END ();
 
     public:
@@ -83,6 +84,8 @@ class NumberCleanerTest : public CppUnit::TestCase {
         
         void test_format_10 ();
 
+        void test_format_11 ();
+
         /*
          * Code factoring - Common resources can be released here.
          * This method is called by unitcpp after each test