diff --git a/mwparserfromhell/nodes/extras/attribute.py b/mwparserfromhell/nodes/extras/attribute.py
index 5888dba..5b98c4f 100644
--- a/mwparserfromhell/nodes/extras/attribute.py
+++ b/mwparserfromhell/nodes/extras/attribute.py
@@ -36,7 +36,7 @@ class Attribute(StringMixIn):
     whose value is ``"foo"``.
     """
 
-    def __init__(self, name, value=None, quoted=True, pad_first="",
+    def __init__(self, name, value=None, quoted=True, pad_first=" ",
                  pad_before_eq="", pad_after_eq=""):
         super(Attribute, self).__init__()
         self._name = name
diff --git a/mwparserfromhell/nodes/tag.py b/mwparserfromhell/nodes/tag.py
index 1d10a47..db60689 100644
--- a/mwparserfromhell/nodes/tag.py
+++ b/mwparserfromhell/nodes/tag.py
@@ -46,7 +46,7 @@ class Tag(Node):
         self._padding = padding
         if closing_tag:
             self._closing_tag = closing_tag
-        elif not self_closing:
+        else:
             self._closing_tag = tag
 
     def __unicode__(self):
diff --git a/tests/_test_tree_equality.py b/tests/_test_tree_equality.py
index 6976a13..cfda97b 100644
--- a/tests/_test_tree_equality.py
+++ b/tests/_test_tree_equality.py
@@ -102,10 +102,14 @@ class TreeEqualityTestCase(TestCase):
             self.assertWikicodeEqual(exp_attr.name, act_attr.name)
             if exp_attr.value is not None:
                 self.assertWikicodeEqual(exp_attr.value, act_attr.value)
-            self.assertIs(exp_attr.quoted, act_attr.quoted)
-            self.assertEqual(exp.attr.padding, act_attr.padding)
+                self.assertIs(exp_attr.quoted, act_attr.quoted)
+            self.assertEqual(exp_attr.pad_first, act_attr.pad_first)
+            self.assertEqual(exp_attr.pad_before_eq, act_attr.pad_before_eq)
+            self.assertEqual(exp_attr.pad_after_eq, act_attr.pad_after_eq)
         self.assertIs(expected.showtag, actual.showtag)
         self.assertIs(expected.self_closing, actual.self_closing)
+        self.assertIs(expected.invalid, actual.invalid)
+        self.assertIs(expected.implicit, actual.implicit)
         self.assertEqual(expected.padding, actual.padding)
         self.assertWikicodeEqual(expected.closing_tag, actual.closing_tag)