2 files changed, 9 insertions, 10 deletions
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathElementBuilder.java b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathElementBuilder.java
index a12b7ed..ec1962c 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathElementBuilder.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathElementBuilder.java
@@ -1,13 +1,14 @@
 package org.zwobble.mammoth.tests.styles.parsing;
 
+import org.zwobble.mammoth.internal.html.HtmlTag;
 import org.zwobble.mammoth.internal.styles.HtmlPathElement;
 
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class HtmlPathElementBuilder {
-    public static HtmlPathElementBuilder tagName(String tagName) {
-        return new HtmlPathElementBuilder(tagName, false, "");
+    public static HtmlPathElementBuilder collapsible(String tagName) {
+        return new HtmlPathElementBuilder(tagName, true, "");
     }
 
     private final String tagName;
@@ -20,15 +21,11 @@ public class HtmlPathElementBuilder {
         this.separator = separator;
     }
 
-    public HtmlPathElementBuilder collapsible(boolean isCollapsible) {
-        return new HtmlPathElementBuilder(tagName, isCollapsible, separator);
-    }
-
     public HtmlPathElementBuilder separator(String separator) {
         return new HtmlPathElementBuilder(tagName, isCollapsible, separator);
     }
 
     public HtmlPathElement build() {
-        return new HtmlPathElement(list(tagName), map(), isCollapsible, separator);
+        return new HtmlPathElement(new HtmlTag(list(tagName), map(), isCollapsible, separator));
     }
 }
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathParsingTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathParsingTests.java
index 7d67287..53acbba 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathParsingTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathParsingTests.java
@@ -2,7 +2,6 @@ package org.zwobble.mammoth.tests.styles.parsing;
 
 import org.junit.Test;
 import org.zwobble.mammoth.internal.styles.HtmlPath;
-import org.zwobble.mammoth.internal.styles.HtmlPathElement;
 import org.zwobble.mammoth.internal.styles.parsing.HtmlPathParser;
 import org.zwobble.mammoth.internal.styles.parsing.StyleMappingTokeniser;
 import org.zwobble.mammoth.internal.styles.parsing.TokenIterator;
@@ -42,7 +41,10 @@ public class HtmlPathParsingTests {
     public void canReadNestedElements() {
         assertThat(
             parseHtmlPath("ul > li"),
-            deepEquals(HtmlPath.elements(HtmlPathElement.collapsible("ul"), HtmlPathElement.collapsible("li"))));
+            deepEquals(HtmlPath.elements(
+                HtmlPathElementBuilder.collapsible("ul").build(),
+                HtmlPathElementBuilder.collapsible("li").build()
+            )));
     }
 
     @Test
@@ -70,7 +72,7 @@ public class HtmlPathParsingTests {
     public void canReadSeparatorForElements() {
         assertThat(
             parseHtmlPath("p:separator('x')"),
-            deepEquals(HtmlPath.elements(HtmlPathElementBuilder.tagName("p").collapsible(true).separator("x").build()))
+            deepEquals(HtmlPath.elements(HtmlPathElementBuilder.collapsible("p").separator("x").build()))
         );
     }