MC6
diff --git a/‎tests/test_phone_numbers.py
Lines changed: 8 additions & 0 deletions b/‎tests/test_phone_numbers.py
Lines changed: 8 additions & 0 deletions
diff --git a/‎tests/test_twiml.py
Lines changed: 31 additions & 0 deletions b/‎tests/test_twiml.py
Lines changed: 31 additions & 0 deletions
diff --git a/‎twilio/twiml.py
Lines changed: 7 additions & 2 deletions b/‎twilio/twiml.py
Lines changed: 7 additions & 2 deletions
diff --git a/‎twilio/util.py
Lines changed: 8 additions & 2 deletions b/‎twilio/util.py
Lines changed: 8 additions & 2 deletions
@@ -13,6 +13,14 @@ def setUp(self):
         self.uri = "/base"
         self.auth = ("AC123", "token")
 
+    def test_application_sid(self):
+        resource = PhoneNumbers(self.uri, self.auth)
+        resource.update_instance = Mock()
+        resource.update("SID", application_sid="foo")
+        resource.update_instance.assert_called_with(
+                "SID", {"ApplicationSid": "foo"})
+
+
     def test_status_callback_url(self):
         resource = PhoneNumbers(self.uri, self.auth)
         resource.update_instance = Mock()
 
@@ -5,6 +5,7 @@
 from twilio import twiml
 from twilio.twiml import TwimlException
 from twilio.twiml import Response
+import xml.etree.ElementTree as ET
 
 class TwilioTest(unittest.TestCase):
     def strip(self, xml):
@@ -288,6 +289,36 @@ def testBadAppend(self):
         """ should raise exceptions for wrong appending"""
         self.improperAppend(twiml.Sms("Hello"))
 
+
+class TestConference(TwilioTest):
+
+    def setUp(self):
+        r = Response()
+        with r.dial() as dial:
+            dial.conference("TestConferenceAttributes", beep=False, waitUrl="",
+                startConferenceOnEnter=True, endConferenceOnExit=True)
+        xml = r.toxml()
+
+        #parse twiml XML string with Element Tree and inspect structure
+        tree = ET.fromstring(xml)
+        self.conf = tree.find(".//Dial/Conference")
+
+    def test_conf_text(self):
+        self.assertEqual(self.conf.text.strip(), "TestConferenceAttributes")
+
+    def test_conf_beep(self):
+        self.assertEqual(self.conf.get('beep'), "false")
+
+    def test_conf_waiturl(self):
+        self.assertEqual(self.conf.get('waitUrl'), "")
+
+    def test_conf_start_conference(self):
+        self.assertEqual(self.conf.get('startConferenceOnEnter'), "true")
+
+    def test_conf_end_conference(self):
+        self.assertEqual(self.conf.get('endConferenceOnExit'), "true")
+
+
 class TestDial(TwilioTest):
 
     def testDial(self):
 
@@ -22,7 +22,7 @@ def __init__(self, **kwargs):
         for k, v in kwargs.items():
             if k == "sender":
                 k = "from"
-            if v:
+            if v is not None:
                 self.attrs[k] = v
 
     def __str__(self):
@@ -54,7 +54,12 @@ def xml(self):
         keys = self.attrs.keys()
         keys.sort()
         for a in keys:
-            el.set(a, str(self.attrs[a]))
+            value = self.attrs[a]
+
+            if isinstance(value, bool):
+                el.set(a, str(value).lower())
+            else:
+                el.set(a, str(value))
 
         if self.body:
             el.text = self.body
 
@@ -24,13 +24,19 @@ def compute_signature(self, uri, params):
 
         :returns: The computed signature
         """
-        s = uri
+        s = unicode(uri)
         if len(params) > 0:
             for k, v in sorted(params.items()):
                 s += k + v
 
         # compute signature and compare signatures
-        computed = base64.encodestring(hmac.new(self.token, s, sha1).digest())
+
+        mac = hmac.new(self.token, s.encode("utf-8"), sha1)
+        computed = base64.b64encode(mac.digest())
+
+        # print base64.b64decode(computed.strip())
+        # print base64.b64decode(computed.strip()).decode("utf-8")
+
         return computed.strip()
 
     def validate(self, uri, params, signature):