diff --git a/src/saml2/mdstore.py b/src/saml2/mdstore.py
index d354c61..92a1d1a 100644
--- a/src/saml2/mdstore.py
+++ b/src/saml2/mdstore.py
@@ -98,7 +98,7 @@ class MetaData(object):
         self.metadata = metadata
 
     def items(self):
-        return self.entity
+        return self.entity.items()
 
     def keys(self):
         return self.entity.keys()
@@ -542,7 +542,7 @@ class MetadataStore(object):
 
     def attribute_requirement(self, entity_id, index=0):
         for md in self.metadata.values():
-            if entity_id in md.items():
+            if entity_id in md:
                 return md.attribute_requirement(entity_id, index)
 
     def keys(self):
diff --git a/tests/test_30_mdstore.py b/tests/test_30_mdstore.py
index 392ad78..88000b2 100644
--- a/tests/test_30_mdstore.py
+++ b/tests/test_30_mdstore.py
@@ -232,3 +232,6 @@ def test_sp_metadata():
                 'urn:oid:0.9.2342.19200300.100.1.3'])
     assert _eq([n["friendly_name"] for n in req["required"]],
                ['surName', 'givenName', 'mail'])
+
+if __name__ == "__main__":
+    test_swami_1()
\ No newline at end of file