Fix Mutex tests

Author: gtback

cybox/objects/mutex_object.py

@@ -54,6 +54,6 @@ def from_obj(mutex_obj, mutex_cls = None):
             mutex_ = mutex_cls
 
         mutex_.named = mutex_obj.get_named()
-        mutex_.name = String.from_dict(mutex_obj.get_Name())
+        mutex_.name = String.from_obj(mutex_obj.get_Name())
 
-        return mutex_
+        return mutex_

cybox/test/objects/mutex_test.py

@@ -6,7 +6,7 @@
 
 class MutexTest(unittest.TestCase):
     def setUp(self):
-        self.test_dict = {'named': True, 'name': {'value': 'test_name'}}
+        self.test_dict = {'named': True, 'name': 'test_name'}
         self.mutex_obj = Mutex.object_from_dict(self.test_dict)
         self.mutex_dict = Mutex.dict_from_object(self.mutex_obj)
 
@@ -26,7 +26,7 @@ def test_dict_from_obj(self):
         self.assertTrue(isinstance(self.mutex_dict, dict))
         #Test the dictionary values
         self.assertEqual(self.mutex_dict['named'], True)
-        self.assertEqual(self.mutex_dict['name']['value'], 'test_name')
+        self.assertEqual(self.mutex_dict['name'], 'test_name')
 
 if __name__ == "__main__":
     unittest.main()