diff --git a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java
index 1eb2a1bc..df014266 100644
--- a/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java
+++ b/markwon-test-span/src/main/java/ru/noties/markwon/test/TestSpanMatcher.java
@@ -84,7 +84,8 @@ public abstract class TestSpanMatcher {
                     public boolean test(TestSpan.Span span) {
                         return expected.name().equals(span.name())
                                 && start == spanned.getSpanStart(span)
-                                && end == spanned.getSpanEnd(span);
+                                && end == spanned.getSpanEnd(span)
+                                && expected.arguments().equals(span.arguments());
                     }
                 })
                 .first(null);
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java
index f2604a67..73c05bdf 100644
--- a/markwon/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/BaseSuiteTest.java
@@ -15,6 +15,11 @@ import ru.noties.markwon.test.TestUtil;
 
 abstract class BaseSuiteTest {
 
+  void match(@NonNull String markdown, @NonNull TestSpan.Document document) {
+    final Spanned spanned = markwon().toMarkdown(markdown);
+    TestSpanMatcher.matches(spanned, document);
+  }
+
   void matchInput(@NonNull String name, @NonNull TestSpan.Document document) {
     final Spanned spanned = markwon().toMarkdown(read(name));
     TestSpanMatcher.matches(spanned, document);
@@ -28,7 +33,7 @@ abstract class BaseSuiteTest {
   @NonNull
   Markwon markwon() {
     return Markwon.builder(RuntimeEnvironment.application)
-      .use(CorePlugin.create())
+      .use(CorePlugin.create(softBreakAddsNewLine()))
       .use(new AbstractMarkwonPlugin() {
         @Override
         public void configureConfiguration(@NonNull MarkwonConfiguration.Builder builder) {
@@ -41,4 +46,8 @@ abstract class BaseSuiteTest {
   boolean useParagraphs() {
     return false;
   }
+
+  boolean softBreakAddsNewLine() {
+    return false;
+  }
 }
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/BlockquoteTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/BlockquoteTest.java
index d5d0a8cb..02eb2674 100644
--- a/markwon/src/test/java/ru/noties/markwon/core/suite/BlockquoteTest.java
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/BlockquoteTest.java
@@ -43,6 +43,6 @@ public class BlockquoteTest extends BaseSuiteTest {
     final Document document = document(
       span(BLOCK_QUOTE, text("blockquote")));
 
-    matchInput("single-blockquote.md", document);
+    match("> blockquote", document);
   }
 }
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/BoldItalicTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/BoldItalicTest.java
index 0fa65ddd..67cb1a0d 100644
--- a/markwon/src/test/java/ru/noties/markwon/core/suite/BoldItalicTest.java
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/BoldItalicTest.java
@@ -17,10 +17,6 @@ import static ru.noties.markwon.test.TestSpan.text;
 @Config(manifest = Config.NONE)
 public class BoldItalicTest extends BaseSuiteTest {
 
-  /*
-   **_bold italic_**
-   */
-
   @Test
   public void test() {
 
@@ -28,6 +24,6 @@ public class BoldItalicTest extends BaseSuiteTest {
       span(BOLD,
         span(ITALIC, text("bold italic"))));
 
-    matchInput("bold-italic.md", document);
+    match("**_bold italic_**", document);
   }
 }
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/CodeTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/CodeTest.java
index 1331b7b8..6e5d0c53 100644
--- a/markwon/src/test/java/ru/noties/markwon/core/suite/CodeTest.java
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/CodeTest.java
@@ -56,7 +56,7 @@ public class CodeTest extends BaseSuiteTest {
       span(CODE, args("multiline", false), text("\u00a0code\u00a0"))
     );
 
-    matchInput("single-code.md", document);
+    match("`code`", document);
   }
 
   @Test
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/EmphasisTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/EmphasisTest.java
new file mode 100644
index 00000000..0e1b1d1c
--- /dev/null
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/EmphasisTest.java
@@ -0,0 +1,27 @@
+package ru.noties.markwon.core.suite;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import ru.noties.markwon.test.TestSpan.Document;
+
+import static ru.noties.markwon.core.suite.TestFactory.ITALIC;
+import static ru.noties.markwon.test.TestSpan.document;
+import static ru.noties.markwon.test.TestSpan.span;
+import static ru.noties.markwon.test.TestSpan.text;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class EmphasisTest extends BaseSuiteTest {
+
+  @Test
+  public void single() {
+
+    final Document document = document(span(ITALIC, text("italic")));
+
+    match("*italic*", document);
+    match("_italic_", document);
+  }
+}
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/HeadingTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/HeadingTest.java
new file mode 100644
index 00000000..efc1a090
--- /dev/null
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/HeadingTest.java
@@ -0,0 +1,40 @@
+package ru.noties.markwon.core.suite;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import ru.noties.markwon.test.TestSpan.Document;
+
+import static ru.noties.markwon.core.suite.TestFactory.HEADING;
+import static ru.noties.markwon.test.TestSpan.args;
+import static ru.noties.markwon.test.TestSpan.document;
+import static ru.noties.markwon.test.TestSpan.span;
+import static ru.noties.markwon.test.TestSpan.text;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class HeadingTest extends BaseSuiteTest {
+
+  @Test
+  public void single_headings() {
+
+    final int[] levels = {1, 2, 3, 4, 5, 6};
+
+    for (int level : levels) {
+
+      final Document document = document(
+        span(HEADING, args("level", level), text("head" + level))
+      );
+
+      final StringBuilder builder = new StringBuilder();
+      for (int i = 0; i < level; i++) {
+        builder.append('#');
+      }
+      builder.append(" head").append(level);
+
+      match(builder.toString(), document);
+    }
+  }
+}
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/LinkTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/LinkTest.java
new file mode 100644
index 00000000..b691db9c
--- /dev/null
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/LinkTest.java
@@ -0,0 +1,29 @@
+package ru.noties.markwon.core.suite;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import ru.noties.markwon.test.TestSpan.Document;
+
+import static ru.noties.markwon.core.suite.TestFactory.LINK;
+import static ru.noties.markwon.test.TestSpan.args;
+import static ru.noties.markwon.test.TestSpan.document;
+import static ru.noties.markwon.test.TestSpan.span;
+import static ru.noties.markwon.test.TestSpan.text;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class LinkTest extends BaseSuiteTest {
+
+  @Test
+  public void single() {
+
+    final Document document = document(
+      span(LINK, args("href", "#href"), text("link"))
+    );
+
+    match("[link](#href)", document);
+  }
+}
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/OrderedListTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/OrderedListTest.java
index 9a674b3f..31fed7d8 100644
--- a/markwon/src/test/java/ru/noties/markwon/core/suite/OrderedListTest.java
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/OrderedListTest.java
@@ -103,6 +103,6 @@ public class OrderedListTest extends BaseSuiteTest {
         text("ol"))
     );
 
-    matchInput("single-ol.md", document);
+    match("1. ol", document);
   }
 }
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/SoftBreakAddsNewLineTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/SoftBreakAddsNewLineTest.java
new file mode 100644
index 00000000..4658dc7d
--- /dev/null
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/SoftBreakAddsNewLineTest.java
@@ -0,0 +1,39 @@
+package ru.noties.markwon.core.suite;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import ru.noties.markwon.test.TestSpan.Document;
+
+import static ru.noties.markwon.test.TestSpan.document;
+import static ru.noties.markwon.test.TestSpan.text;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class SoftBreakAddsNewLineTest extends BaseSuiteTest {
+
+  /*
+hello there!
+this one is on the next line
+hard break to the full extend
+   */
+
+  @Test
+  public void test() {
+
+    final Document document = document(
+      text("hello there!\n"),
+      text("this one is on the next line\n"),
+      text("hard break to the full extend")
+    );
+
+    matchInput("soft-break-adds-new-line.md", document);
+  }
+
+  @Override
+  boolean softBreakAddsNewLine() {
+    return true;
+  }
+}
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/SoftBreakTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/SoftBreakTest.java
new file mode 100644
index 00000000..25991e4e
--- /dev/null
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/SoftBreakTest.java
@@ -0,0 +1,33 @@
+package ru.noties.markwon.core.suite;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import ru.noties.markwon.test.TestSpan.Document;
+
+import static ru.noties.markwon.test.TestSpan.document;
+import static ru.noties.markwon.test.TestSpan.text;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class SoftBreakTest extends BaseSuiteTest {
+
+    @Test
+    public void test() {
+
+        final Document document = document(
+                text("First line "),
+                text("same line but with space between "),
+                text("this is also the first line")
+        );
+
+        matchInput("soft-break.md", document);
+    }
+
+    @Override
+    boolean softBreakAddsNewLine() {
+        return false;
+    }
+}
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/StrongEmphasisTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/StrongEmphasisTest.java
new file mode 100644
index 00000000..12d9358b
--- /dev/null
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/StrongEmphasisTest.java
@@ -0,0 +1,29 @@
+package ru.noties.markwon.core.suite;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import ru.noties.markwon.test.TestSpan.Document;
+
+import static ru.noties.markwon.core.suite.TestFactory.BOLD;
+import static ru.noties.markwon.test.TestSpan.document;
+import static ru.noties.markwon.test.TestSpan.span;
+import static ru.noties.markwon.test.TestSpan.text;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class StrongEmphasisTest extends BaseSuiteTest {
+
+  @Test
+  public void single() {
+
+    final Document document = document(
+      span(BOLD, text("bold"))
+    );
+
+    match("**bold**", document);
+    match("__bold__", document);
+  }
+}
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/TestFactory.java b/markwon/src/test/java/ru/noties/markwon/core/suite/TestFactory.java
index 76e4dc03..47b63fda 100644
--- a/markwon/src/test/java/ru/noties/markwon/core/suite/TestFactory.java
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/TestFactory.java
@@ -22,7 +22,9 @@ class TestFactory implements SpannableFactory {
   static final String BLOCK_QUOTE = "blockquote";
   static final String PARAGRAPH = "paragraph";
   static final String ORDERED_LIST = "ordered-list";
+  static final String UN_ORDERED_LIST = "un-ordered-list";
   static final String HEADING = "heading";
+  static final String THEMATIC_BREAK = "thematic-break";
 
   private final boolean useParagraphs;
 
@@ -63,13 +65,13 @@ class TestFactory implements SpannableFactory {
   @Nullable
   @Override
   public Object bulletListItem(@NonNull MarkwonTheme theme, int level) {
-    return null;
+    return span(UN_ORDERED_LIST, args("level", level));
   }
 
   @Nullable
   @Override
   public Object thematicBreak(@NonNull MarkwonTheme theme) {
-    return null;
+    return span(THEMATIC_BREAK);
   }
 
   @Nullable
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/ThematicBreakTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/ThematicBreakTest.java
new file mode 100644
index 00000000..a5005a98
--- /dev/null
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/ThematicBreakTest.java
@@ -0,0 +1,30 @@
+package ru.noties.markwon.core.suite;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import ru.noties.markwon.test.TestSpan.Document;
+
+import static ru.noties.markwon.core.suite.TestFactory.THEMATIC_BREAK;
+import static ru.noties.markwon.test.TestSpan.document;
+import static ru.noties.markwon.test.TestSpan.span;
+import static ru.noties.markwon.test.TestSpan.text;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class ThematicBreakTest extends BaseSuiteTest {
+
+  @Test
+  public void single() {
+
+    final Document document = document(
+      span(THEMATIC_BREAK, text("\u00a0"))
+    );
+
+    match("---", document);
+    match("----", document);
+    match("***", document);
+  }
+}
diff --git a/markwon/src/test/java/ru/noties/markwon/core/suite/UnOrderedListTest.java b/markwon/src/test/java/ru/noties/markwon/core/suite/UnOrderedListTest.java
new file mode 100644
index 00000000..b5aa346e
--- /dev/null
+++ b/markwon/src/test/java/ru/noties/markwon/core/suite/UnOrderedListTest.java
@@ -0,0 +1,84 @@
+package ru.noties.markwon.core.suite;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import ru.noties.markwon.test.TestSpan.Document;
+
+import static ru.noties.markwon.core.suite.TestFactory.UN_ORDERED_LIST;
+import static ru.noties.markwon.test.TestSpan.args;
+import static ru.noties.markwon.test.TestSpan.document;
+import static ru.noties.markwon.test.TestSpan.span;
+import static ru.noties.markwon.test.TestSpan.text;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class UnOrderedListTest extends BaseSuiteTest {
+
+  @Test
+  public void single() {
+
+    final Document document = document(
+      span(UN_ORDERED_LIST, args("level", 0), text("ul"))
+    );
+
+    match("* ul", document);
+  }
+
+  @Test
+  public void test() {
+    /*
+     * First
+     * Second
+     * Third
+     */
+
+    final Document document = document(
+      span(UN_ORDERED_LIST,
+        args("level", 0),
+        text("First\n"),
+        span(UN_ORDERED_LIST,
+          args("level", 1),
+          text("Second\n"),
+          span(UN_ORDERED_LIST,
+            args("level", 2),
+            text("Third"))))
+    );
+
+    matchInput("ul.md", document);
+  }
+
+  @Test
+  public void levels() {
+
+    /*
+     * First
+     * * Second
+     * * * Third
+     */
+
+    final Document document = document(
+      span(UN_ORDERED_LIST,
+        args("level", 0),
+        text("First")),
+      text("\n"),
+      span(UN_ORDERED_LIST,
+        args("level", 0),
+        span(UN_ORDERED_LIST,
+          args("level", 1),
+          text("Second"))),
+      text("\n"),
+      span(UN_ORDERED_LIST,
+        args("level", 0),
+        span(UN_ORDERED_LIST,
+          args("level", 1),
+          span(UN_ORDERED_LIST,
+            args("level", 2),
+            text("Third"))))
+    );
+
+    matchInput("ul-levels.md", document);
+  }
+}
diff --git a/markwon/src/test/resources/tests/bold-italic.md b/markwon/src/test/resources/tests/bold-italic.md
deleted file mode 100644
index 757cfe8c..00000000
--- a/markwon/src/test/resources/tests/bold-italic.md
+++ /dev/null
@@ -1 +0,0 @@
-**_bold italic_**
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-a.yaml b/markwon/src/test/resources/tests/single-a.yaml
deleted file mode 100644
index 82b1b134..00000000
--- a/markwon/src/test/resources/tests/single-a.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-input: "[link](#href)"
-
-output:
-  - a: "link"
-    href: "#href"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-b.yaml b/markwon/src/test/resources/tests/single-b.yaml
deleted file mode 100644
index a107424d..00000000
--- a/markwon/src/test/resources/tests/single-b.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-input: "**bold**"
-
-output:
-  - b: "bold"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-blockquote.md b/markwon/src/test/resources/tests/single-blockquote.md
deleted file mode 100644
index 32ce4098..00000000
--- a/markwon/src/test/resources/tests/single-blockquote.md
+++ /dev/null
@@ -1 +0,0 @@
-> blockquote
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-code.md b/markwon/src/test/resources/tests/single-code.md
deleted file mode 100644
index d3a84179..00000000
--- a/markwon/src/test/resources/tests/single-code.md
+++ /dev/null
@@ -1 +0,0 @@
-`code`
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-h1.yaml b/markwon/src/test/resources/tests/single-h1.yaml
deleted file mode 100644
index 613ae0c5..00000000
--- a/markwon/src/test/resources/tests/single-h1.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-input: "# head1"
-
-output:
-  - h1: "head1"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-h2.yaml b/markwon/src/test/resources/tests/single-h2.yaml
deleted file mode 100644
index 09489697..00000000
--- a/markwon/src/test/resources/tests/single-h2.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-input: "## head2"
-
-output:
-  - h2: "head2"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-h3.yaml b/markwon/src/test/resources/tests/single-h3.yaml
deleted file mode 100644
index 8f2d99a0..00000000
--- a/markwon/src/test/resources/tests/single-h3.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-input: "### head3"
-
-output:
-  - h3: "head3"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-h4.yaml b/markwon/src/test/resources/tests/single-h4.yaml
deleted file mode 100644
index b65a2b73..00000000
--- a/markwon/src/test/resources/tests/single-h4.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-input: "#### head4"
-
-output:
-  - h4: "head4"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-h5.yaml b/markwon/src/test/resources/tests/single-h5.yaml
deleted file mode 100644
index 44a3d078..00000000
--- a/markwon/src/test/resources/tests/single-h5.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-input: "##### head5"
-
-output:
-  - h5: "head5"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-h6.yaml b/markwon/src/test/resources/tests/single-h6.yaml
deleted file mode 100644
index f040ecaf..00000000
--- a/markwon/src/test/resources/tests/single-h6.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-input: "###### head6"
-
-output:
-  - h6: "head6"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-hr.yaml b/markwon/src/test/resources/tests/single-hr.yaml
deleted file mode 100644
index 86bb106a..00000000
--- a/markwon/src/test/resources/tests/single-hr.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# it is failing as we are still removing white spaces manually
-# this will be fixed when different logic for new lines will be introduced
-
-input: "---"
-
-output:
-  - hr: "\u00a0"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-i.yaml b/markwon/src/test/resources/tests/single-i.yaml
deleted file mode 100644
index 334e923c..00000000
--- a/markwon/src/test/resources/tests/single-i.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-input: "*italic*"
-
-output:
-  - i: "italic"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-ol.md b/markwon/src/test/resources/tests/single-ol.md
deleted file mode 100644
index 61a41e63..00000000
--- a/markwon/src/test/resources/tests/single-ol.md
+++ /dev/null
@@ -1 +0,0 @@
-1. ol
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/single-ul.yaml b/markwon/src/test/resources/tests/single-ul.yaml
deleted file mode 100644
index d5fc6647..00000000
--- a/markwon/src/test/resources/tests/single-ul.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-input: "* ul"
-
-output:
-  - ul: "ul"
-    level: 0
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/soft-break-adds-new-line.md b/markwon/src/test/resources/tests/soft-break-adds-new-line.md
new file mode 100644
index 00000000..5d81a53e
--- /dev/null
+++ b/markwon/src/test/resources/tests/soft-break-adds-new-line.md
@@ -0,0 +1,3 @@
+hello there!
+this one is on the next line
+hard break to the full extend
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/soft-break-adds-new-line.yaml b/markwon/src/test/resources/tests/soft-break-adds-new-line.yaml
deleted file mode 100644
index 4fbb7d0a..00000000
--- a/markwon/src/test/resources/tests/soft-break-adds-new-line.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-input: |-
-  hello there!
-  this one is on the next line
-  hard break to the full extend
-
-config:
-  soft-break-adds-new-line: true
-
-output:
-  - text: "hello there!\nthis one is on the next line\nhard break to the full extend"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/soft-break.md b/markwon/src/test/resources/tests/soft-break.md
new file mode 100644
index 00000000..8e768a71
--- /dev/null
+++ b/markwon/src/test/resources/tests/soft-break.md
@@ -0,0 +1,3 @@
+First line
+same line but with space between
+this is also the first line
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/soft-break.yaml b/markwon/src/test/resources/tests/soft-break.yaml
deleted file mode 100644
index 4406a5c7..00000000
--- a/markwon/src/test/resources/tests/soft-break.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-input: |-
-  First line
-  same line but with space between
-  this is also the first line
-
-output:
-  - text: "First line same line but with space between this is also the first line"
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/ul-levels.md b/markwon/src/test/resources/tests/ul-levels.md
new file mode 100644
index 00000000..767d3e7c
--- /dev/null
+++ b/markwon/src/test/resources/tests/ul-levels.md
@@ -0,0 +1,3 @@
+* First
+* * Second
+* * * Third
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/ul-levels.yaml b/markwon/src/test/resources/tests/ul-levels.yaml
deleted file mode 100644
index a7a06c96..00000000
--- a/markwon/src/test/resources/tests/ul-levels.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-input: |-
-  * First
-  * * Second
-  * * * Third
-
-output:
-  - ul: "First"
-    level: 0
-  - text: "\n"
-  - ul:
-    - ul: "Second"
-      level: 1
-    level: 0
-  - text: "\n"
-  - ul:
-    - ul:
-      - ul: "Third"
-        level: 2
-      level: 1
-    level: 0
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/ul.md b/markwon/src/test/resources/tests/ul.md
new file mode 100644
index 00000000..0dd60b3e
--- /dev/null
+++ b/markwon/src/test/resources/tests/ul.md
@@ -0,0 +1,3 @@
+* First
+  * Second
+    * Third
\ No newline at end of file
diff --git a/markwon/src/test/resources/tests/ul.yaml b/markwon/src/test/resources/tests/ul.yaml
deleted file mode 100644
index 171145da..00000000
--- a/markwon/src/test/resources/tests/ul.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-input: |-
-  * First
-    * Second
-      * Third
-
-output:
-  - ul:
-    - text: "First\n"
-    - ul:
-      - text: "Second\n"
-      - ul: "Third"
-        level: 2
-      level: 1
-    level: 0
\ No newline at end of file