--- a/src/test/helpers.py	Fri Mar 11 16:41:44 2016 +0100
+++ b/src/test/helpers.py	Fri Mar 11 17:42:56 2016 +0100
@@ -190,12 +190,12 @@
         entry = self.getSentMessage(profile_index)
         return entry.toXml() if entry else None
 
-    def findFeaturesSet(self, features, category=None, type_=None, jid_=None, profile_key=None):
+    def findFeaturesSet(self, features, identity=None, jid_=None, profile=C.PROF_KEY_NONE):
         """Call self.addFeature from your tests to change the return value.
 
         @return: a set of entities
         """
-        client = self.getClient(profile_key)
+        client = self.getClient(profile)
         if jid_ is None:
             jid_ = JID(client.jid.host)
         try:
@@ -301,7 +301,7 @@
         # manipulating basic stuff, the others should be overwritten when needed
         self.host = host
         self.params = FakeParams(host, None)
-        self.config = self.parseMainConf()
+        self.config = tools_config.parseMainConf()
         self.reinit()
 
     def reinit(self):