diff --git a/src/xmlrpc/accounts.php b/src/xmlrpc/accounts.php
index 0bf503c..34a63a9 100644
--- a/src/xmlrpc/accounts.php
+++ b/src/xmlrpc/accounts.php
@@ -32,117 +32,6 @@ include_once __DIR__ . '/accounts_phone.php';
 
 include_once __DIR__ . '/results_values.php';
 
-// args = [user, pwd, [domain], [algo]]
-// /!\ This method must be used for tests purposes only /!\
-function xmlrpc_get_confirmation_key($method, $args) {
-	$user = $args[0];
-	$pwd = $args[1];
-	$domain = get_domain($args[2]);
-	$algo = get_algo($args[3]);
-
-	Logger::getInstance()->message("[XMLRPC] xmlrpc_get_confirmation_key(" . $user . ", " . $domain . ", " . $algo . ")");
-
-	if (!check_parameter($user)) {
-		return MISSING_USERNAME_PARAM;
-	} else if (!ALLOW_TEST_ACCOUNTS) {
-		Logger::getInstance()->error ("Non test account unauthorized");
-		return TEST_ACCOUNTS_DISABLED;
-	} else if ($algo == NULL) {
-		return ALGO_NOT_SUPPORTED;
-	}
-
-	$database = new Database();
-	$db = $database->getConnection();
-	$account = new Account($db);
-	$account->username = $user;
-	$account->domain = $domain;
-
-	if (!$account->getOne()) {
-		return ACCOUNT_NOT_FOUND;
-	}
-
-	$password = new Password($db);
-	$password->account_id = $account->id;
-	$password->algorithm = $algo;
-	
-	if (!$password->getOne()) {
-		return PASSWORD_NOT_FOUND;
-	}
-
-	if ($algo == CLEAR) {
-		$hashed_password = $pwd;
-	} else {
-		$hashed_password = hash_password($user, $pwd, $domain, $algo);
-	}
-
-	if (!password_match($hashed_password, $password->password) 
-		&& !password_match($pwd, $password->password)) { // This condition is specific for liblinphone tester....
-		return PASSWORD_DOESNT_MATCH;
-	}
-
-	$key = $account->confirmation_key;
-	Logger::getInstance()->debug("[XMLRPC] returning key = " . $key);
-	return $key;
-}
-
-// args = [user, pwd, [domain], [algo]]
-// /!\ This method must be used for tests purposes only /!\
-function xmlrpc_delete_account($method, $args) {
-	$user = $args[0];
-	$pwd = $args[1];
-	$domain = get_domain($args[2]);
-	$algo = get_algo($args[3]);
-
-	Logger::getInstance()->message("[XMLRPC] xmlrpc_delete_account(" . $user . ", " . $domain . ", " . $algo . ")");
-
-	if ($algo == NULL) {
-		return ALGO_NOT_SUPPORTED;
-	} else if (!check_parameter($user)) {
-		return MISSING_USERNAME_PARAM;
-	} else if (!ALLOW_TEST_ACCOUNTS) {
-		return TEST_ACCOUNTS_DISABLED;
-	}
-
-	$database = new Database();
-	$db = $database->getConnection();
-	$account = new Account($db);
-	$account->username = $user;
-	$account->domain = $domain;
-
-	if (!$account->getOne()) {
-		return ACCOUNT_NOT_FOUND;
-	}
-
-	$password = new Password($db);
-	$password->account_id = $account->id;
-	$password->algorithm = $algo;
-
-	if (!$password->getOne()) {
-		return PASSWORD_NOT_FOUND;
-	}
-
-	if ($algo == CLEAR) {
-		$hashed_password = $pwd;
-	} else {
-		$hashed_password = hash_password($user, $pwd, $domain, $algo);
-	}
-	if (!password_match($hashed_password, $password->password) 
-		&& !password_match($pwd, $password->password)) { // This condition is specific for liblinphone tester....
-		return PASSWORD_DOESNT_MATCH;
-	}
-
-	$alias = new Alias($db);
-	$alias->account_id = $account->id;
-
-	$account->delete();
-	$password->delete();
-	$alias->delete();
-
-	return OK;
-}
-
-/* ************************************************************************************************* */
-
 // args = [username, [domain]]
 function xmlrpc_is_account_used($method, $args) {
 	$user = $args[0];
@@ -262,12 +151,6 @@ function xmlrpc_get_accounts_count($method, $args) {
 }
 
 function xmlrpc_accounts_register_methods($server) {
-	if (ALLOW_TEST_ACCOUNTS) {
-		// /!\ This methods must be used for tests purposes only /!\
-		xmlrpc_server_register_method($server, 'get_confirmation_key', 'xmlrpc_get_confirmation_key');// args = [user, pwd, [domain], [algo]], return confirmation_key
-		xmlrpc_server_register_method($server, 'delete_account', 'xmlrpc_delete_account');// args = [user, pwd, [domain], [algo]]
-	}
-
  	xmlrpc_server_register_method($server, 'is_account_used', 'xmlrpc_is_account_used');// args = [username, [domain]], return OK or NOK
 	xmlrpc_server_register_method($server, 'is_account_activated', 'xmlrpc_is_account_activated');// args = [username, [domain]], return OK or NOK
 	xmlrpc_server_register_method($server, 'recover_account_from_confirmation_key', 'xmlrpc_recover_account_from_confirmation_key');// args = [username, key, [domain], [algo]]
diff --git a/src/xmlrpc/liblinphone_tester.php b/src/xmlrpc/liblinphone_tester.php
new file mode 100644
index 0000000..51cd5b0
--- /dev/null
+++ b/src/xmlrpc/liblinphone_tester.php
@@ -0,0 +1,152 @@
+<?php
+
+/*
+	Flexisip Account Manager is a set of tools to manage SIP accounts.
+	Copyright (C) 2019 Belledonne Communications SARL, All rights reserved.
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as
+	published by the Free Software Foundation, either version 3 of the
+	License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+include_once __DIR__ . '/../database/database.php';
+
+include_once __DIR__ . '/../objects/account.php';
+include_once __DIR__ . '/../objects/password.php';
+include_once __DIR__ . '/../objects/alias.php';
+
+include_once __DIR__ . '/../misc/utilities.php';
+
+include_once __DIR__ . '/results_values.php';
+
+// args = [user, pwd, [domain], [algo]]
+// /!\ This method must be used for tests purposes only /!\
+function xmlrpc_get_confirmation_key($method, $args) {
+	$user = $args[0];
+	$pwd = $args[1];
+	$domain = get_domain($args[2]);
+	$algo = get_algo($args[3]);
+
+	Logger::getInstance()->message("[XMLRPC] xmlrpc_get_confirmation_key(" . $user . ", " . $domain . ", " . $algo . ")");
+
+	if (!check_parameter($user)) {
+		return MISSING_USERNAME_PARAM;
+	} else if (!ALLOW_TEST_ACCOUNTS) {
+		Logger::getInstance()->error ("Non test account unauthorized");
+		return TEST_ACCOUNTS_DISABLED;
+	} else if ($algo == NULL) {
+		return ALGO_NOT_SUPPORTED;
+	}
+
+	$database = new Database();
+	$db = $database->getConnection();
+	$account = new Account($db);
+	$account->username = $user;
+	$account->domain = $domain;
+
+	if (!$account->getOne()) {
+		return ACCOUNT_NOT_FOUND;
+	}
+
+	$password = new Password($db);
+	$password->account_id = $account->id;
+	$password->algorithm = $algo;
+	
+	if (!$password->getOne()) {
+		return PASSWORD_NOT_FOUND;
+	}
+
+	if ($algo == CLEAR) {
+		$hashed_password = $pwd;
+	} else {
+		$hashed_password = hash_password($user, $pwd, $domain, $algo);
+	}
+
+	if (!password_match($hashed_password, $password->password) 
+		&& !password_match($pwd, $password->password)) { // This condition is specific for liblinphone tester....
+		return PASSWORD_DOESNT_MATCH;
+	}
+
+	if ($account->confirmation_key == INVALID_CONFIRMATION_KEY) {
+		// We have to generate a new one because 
+		$account->confirmation_key = uniqid();
+		$account->update();
+	}
+
+	$key = $account->confirmation_key;
+	Logger::getInstance()->debug("[XMLRPC] returning key = " . $key);
+	return $key;
+}
+
+// args = [user, pwd, [domain], [algo]]
+// /!\ This method must be used for tests purposes only /!\
+function xmlrpc_delete_account($method, $args) {
+	$user = $args[0];
+	$pwd = $args[1];
+	$domain = get_domain($args[2]);
+	$algo = get_algo($args[3]);
+
+	Logger::getInstance()->message("[XMLRPC] xmlrpc_delete_account(" . $user . ", " . $domain . ", " . $algo . ")");
+
+	if ($algo == NULL) {
+		return ALGO_NOT_SUPPORTED;
+	} else if (!check_parameter($user)) {
+		return MISSING_USERNAME_PARAM;
+	} else if (!ALLOW_TEST_ACCOUNTS) {
+		return TEST_ACCOUNTS_DISABLED;
+	}
+
+	$database = new Database();
+	$db = $database->getConnection();
+	$account = new Account($db);
+	$account->username = $user;
+	$account->domain = $domain;
+
+	if (!$account->getOne()) {
+		return ACCOUNT_NOT_FOUND;
+	}
+
+	$password = new Password($db);
+	$password->account_id = $account->id;
+	$password->algorithm = $algo;
+
+	if (!$password->getOne()) {
+		return PASSWORD_NOT_FOUND;
+	}
+
+	if ($algo == CLEAR) {
+		$hashed_password = $pwd;
+	} else {
+		$hashed_password = hash_password($user, $pwd, $domain, $algo);
+	}
+	if (!password_match($hashed_password, $password->password) 
+		&& !password_match($pwd, $password->password)) { // This condition is specific for liblinphone tester....
+		return PASSWORD_DOESNT_MATCH;
+	}
+
+	$alias = new Alias($db);
+	$alias->account_id = $account->id;
+
+	$account->delete();
+	$password->delete();
+	$alias->delete();
+
+	return OK;
+}
+
+// /!\ This methods must be used for tests purposes only /!\
+function xmlrpc_liblinphone_tester_register_methods($server) {
+	xmlrpc_server_register_method($server, 'get_confirmation_key', 'xmlrpc_get_confirmation_key');// args = [user, pwd, [domain], [algo]], return confirmation_key
+	xmlrpc_server_register_method($server, 'delete_account', 'xmlrpc_delete_account');// args = [user, pwd, [domain], [algo]]
+}
+
+?>
diff --git a/src/xmlrpc/passwords.php b/src/xmlrpc/passwords.php
index 9a5cb4e..83d58ab 100644
--- a/src/xmlrpc/passwords.php
+++ b/src/xmlrpc/passwords.php
@@ -204,6 +204,8 @@ function xmlrpc_check_authentication_and_upgrade_password($method, $args) {
 }
 
 function xmlrpc_passwords_register_methods($server) {
+	// The below two methods are the same but with different names, update_hash was the previous one and is kept here for the time being for compatibility purposes
+	xmlrpc_server_register_method($server, 'update_hash', 'xmlrpc_update_password');// args = [username, old hash, new hash, [domain], [algo]], return OK
 	xmlrpc_server_register_method($server, 'update_password', 'xmlrpc_update_password');// args = [username, old hash, new hash, [domain], [algo]], return OK
 	xmlrpc_server_register_method($server, 'update_passwords', 'xmlrpc_update_passwords');// args = [username, old hash, md5_hash, sha256_hash, [domain]]
 
diff --git a/src/xmlrpc/xmlrpc.php b/src/xmlrpc/xmlrpc.php
index 0b26c9b..dd15925 100644
--- a/src/xmlrpc/xmlrpc.php
+++ b/src/xmlrpc/xmlrpc.php
@@ -104,8 +104,13 @@ xmlrpc_passwords_register_methods($server);
 xmlrpc_user_info_register_methods($server);
 
 if (USE_IN_APP_PURCHASES) {
+	include_once __DIR__ . '/inapp.php';
 	xmlrpc_inapp_register_methods($server);
 }
+if (ALLOW_TEST_ACCOUNTS) {
+	include_once __DIR__ . '/liblinphone_tester.php';
+	xmlrpc_liblinphone_tester_register_methods($server);		
+}
 
 if ($request) {
 	$options = array('output_type' => 'xml', 'version' => 'auto');