diff -r 8ad6c097bc5b -r b381eaa774ab tests/smtp.py
--- a/tests/smtp.py	Thu Feb 23 16:59:49 2012 +0100
+++ b/tests/smtp.py	Sat Feb 25 16:12:07 2012 +0100
@@ -24,16 +24,18 @@
         self.smtp_server.close()
 
     def getSMTP(self, c=None):
-        ret={"send_from":"send@t.de",
+        _c={"send_from":"send@t.de",
             "host":HOST,
             "port":PORT,
             "typ":"smtp",
             }
 
         if c:
-            ret.update(c)
+            _c.update(c)
 
-        return SMTP("test",ret.items())
+        ret = SMTP("test")
+        ret.load(_c.items())
+        return ret
 
     def testSendMail(self):
         p=self.getSMTP()
@@ -120,7 +122,7 @@
             "password":"p",
             "typ":"smtp",
             }
-        s=SMTP("test",c.items())
+        s = self.getSMTP(c)
         self.assertEqual(s.send_from, "send@t.de")
         self.assertEqual(s.host, HOST)
         self.assertEqual(s.port, PORT)
@@ -130,12 +132,12 @@
         self.assertEqual(s.TLS,False)
 
         c.update({"TLS":True, "SSL":True})
-        s=SMTP("test", c.items())
+        s = self.getSMTP(c)
         self.assertEqual(s.SSL,True)
         self.assertEqual(s.TLS,True)
         
         del c["host"]
-        self.assertRaises(NeededOption,SMTP,"test",c.items())
+        self.assertRaises(NeededOption, s.load, c)
 
     def testSendFunc(self):
         s = self.getSMTP()