diff --git a/src/format/json.rs b/src/format/json.rs
index c9473d500aa..ce9f0a826c9 100644
--- a/src/format/json.rs
+++ b/src/format/json.rs
@@ -18,3 +18,27 @@ pub struct Json<T>(pub T);
 text_format!(Json based on serde_json);
 
 binary_format!(Json based on serde_json);
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::format::{Binary, Text};
+    use serde::{Deserialize, Serialize};
+    #[cfg(feature = "wasm_test")]
+    use wasm_bindgen_test::wasm_bindgen_test as test;
+
+    #[test]
+    fn json_format() {
+        #[derive(Serialize, Deserialize)]
+        struct Data {
+            value: u8,
+        }
+
+        let Json(data): Json<Result<Data, _>> = Json::from(Ok(r#"{"value": 123}"#.to_string()));
+        let data = data.unwrap();
+        assert_eq!(data.value, 123);
+
+        let _stored: Text = Json(&data).into();
+        let _stored: Binary = Json(&data).into();
+    }
+}
diff --git a/src/virtual_dom/vcomp.rs b/src/virtual_dom/vcomp.rs
index 0cfe773ea37..ea2c3b39eb3 100644
--- a/src/virtual_dom/vcomp.rs
+++ b/src/virtual_dom/vcomp.rs
@@ -293,3 +293,67 @@ impl<COMP: Component> fmt::Debug for VChild<COMP> {
         f.write_str("VChild<_>")
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::macros::Properties;
+    use crate::{html, Component, ComponentLink, Html, ShouldRender};
+    #[cfg(feature = "wasm_test")]
+    use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
+
+    #[cfg(feature = "wasm_test")]
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    struct Comp;
+
+    #[derive(Clone, PartialEq, Properties)]
+    struct Props {
+        field_1: u32,
+        field_2: u32,
+    }
+
+    impl Component for Comp {
+        type Message = ();
+        type Properties = Props;
+
+        fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
+            Comp
+        }
+
+        fn update(&mut self, _: Self::Message) -> ShouldRender {
+            unimplemented!();
+        }
+
+        fn view(&self) -> Html {
+            unimplemented!();
+        }
+    }
+
+    #[test]
+    fn set_properties_to_component() {
+        html! {
+            <Comp />
+        };
+
+        html! {
+            <Comp field_1=1 />
+        };
+
+        html! {
+            <Comp field_2=2 />
+        };
+
+        html! {
+            <Comp field_1=1 field_2=2 />
+        };
+
+        let props = Props {
+            field_1: 1,
+            field_2: 1,
+        };
+
+        html! {
+            <Comp with props />
+        };
+    }
+}
diff --git a/src/virtual_dom/vlist.rs b/src/virtual_dom/vlist.rs
index 5748d4a1b00..7e668d479af 100644
--- a/src/virtual_dom/vlist.rs
+++ b/src/virtual_dom/vlist.rs
@@ -115,3 +115,45 @@ impl VDiff for VList {
         previous_sibling
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::{html, Component, ComponentLink, Html, ShouldRender};
+    #[cfg(feature = "wasm_test")]
+    use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
+
+    #[cfg(feature = "wasm_test")]
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    struct Comp;
+
+    impl Component for Comp {
+        type Message = ();
+        type Properties = ();
+
+        fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
+            Comp
+        }
+
+        fn update(&mut self, _: Self::Message) -> ShouldRender {
+            unimplemented!();
+        }
+
+        fn view(&self) -> Html {
+            unimplemented!();
+        }
+    }
+
+    #[test]
+    fn check_fragments() {
+        let fragment = html! {
+            <>
+            </>
+        };
+        html! {
+            <div>
+                { fragment }
+            </div>
+        };
+    }
+}
diff --git a/src/virtual_dom/vtag.rs b/src/virtual_dom/vtag.rs
index cd9f9729118..d993236b1ba 100644
--- a/src/virtual_dom/vtag.rs
+++ b/src/virtual_dom/vtag.rs
@@ -537,3 +537,414 @@ where
         from.clone()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{html, Component, ComponentLink, Html, ShouldRender};
+    use stdweb::web::{document, IElement};
+    #[cfg(feature = "wasm_test")]
+    use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
+
+    #[cfg(feature = "wasm_test")]
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    struct Comp;
+
+    impl Component for Comp {
+        type Message = ();
+        type Properties = ();
+
+        fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
+            Comp
+        }
+
+        fn update(&mut self, _: Self::Message) -> ShouldRender {
+            unimplemented!();
+        }
+
+        fn view(&self) -> Html {
+            unimplemented!();
+        }
+    }
+
+    struct CompInt;
+
+    impl Component for CompInt {
+        type Message = u32;
+        type Properties = ();
+
+        fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
+            CompInt
+        }
+
+        fn update(&mut self, _: Self::Message) -> ShouldRender {
+            unimplemented!();
+        }
+
+        fn view(&self) -> Html {
+            unimplemented!();
+        }
+    }
+
+    struct CompBool;
+
+    impl Component for CompBool {
+        type Message = bool;
+        type Properties = ();
+
+        fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
+            CompBool
+        }
+
+        fn update(&mut self, _: Self::Message) -> ShouldRender {
+            unimplemented!();
+        }
+
+        fn view(&self) -> Html {
+            unimplemented!();
+        }
+    }
+
+    #[test]
+    fn it_compares_tags() {
+        let a = html! {
+            <div></div>
+        };
+
+        let b = html! {
+            <div></div>
+        };
+
+        let c = html! {
+            <p></p>
+        };
+
+        assert_eq!(a, b);
+        assert_ne!(a, c);
+    }
+
+    #[test]
+    fn it_compares_text() {
+        let a = html! {
+            <div>{ "correct" }</div>
+        };
+
+        let b = html! {
+            <div>{ "correct" }</div>
+        };
+
+        let c = html! {
+            <div>{ "incorrect" }</div>
+        };
+
+        assert_eq!(a, b);
+        assert_ne!(a, c);
+    }
+
+    #[test]
+    fn it_compares_attributes() {
+        let a = html! {
+            <div a="test"></div>
+        };
+
+        let b = html! {
+            <div a="test"></div>
+        };
+
+        let c = html! {
+            <div a="fail"></div>
+        };
+
+        assert_eq!(a, b);
+        assert_ne!(a, c);
+    }
+
+    #[test]
+    fn it_compares_children() {
+        let a = html! {
+            <div>
+                <p></p>
+            </div>
+        };
+
+        let b = html! {
+            <div>
+                <p></p>
+            </div>
+        };
+
+        let c = html! {
+            <div>
+                <span></span>
+            </div>
+        };
+
+        assert_eq!(a, b);
+        assert_ne!(a, c);
+    }
+
+    #[test]
+    fn it_compares_classes() {
+        let a = html! {
+            <div class="test"></div>
+        };
+
+        let b = html! {
+            <div class="test"></div>
+        };
+
+        let c = html! {
+            <div class="fail"></div>
+        };
+
+        let d = html! {
+            <div class=format!("fail")></div>
+        };
+
+        assert_eq!(a, b);
+        assert_ne!(a, c);
+        assert_eq!(c, d);
+    }
+
+    #[test]
+    fn classes_from_local_variables() {
+        let a = html! {
+            <div class=("class-1", "class-2")></div>
+        };
+
+        let class_2 = "class-2";
+        let b = html! {
+            <div class=("class-1", class_2)></div>
+        };
+
+        let class_2_fmt = format!("class-{}", 2);
+        let c = html! {
+            <div class=("class-1", class_2_fmt)></div>
+        };
+
+        assert_eq!(a, b);
+        assert_eq!(a, c);
+    }
+
+    #[test]
+    fn supports_multiple_classes_string() {
+        let a = html! {
+            <div class="class-1 class-2   class-3"></div>
+        };
+
+        let b = html! {
+            <div class="class-2 class-3 class-1"></div>
+        };
+
+        assert_ne!(a, b);
+
+        if let VNode::VTag(vtag) = a {
+            println!("{:?}", vtag.classes);
+            assert!(vtag.classes.contains("class-1"));
+            assert!(vtag.classes.contains("class-2"));
+            assert!(vtag.classes.contains("class-3"));
+        } else {
+            panic!("vtag expected");
+        }
+    }
+
+    #[test]
+    fn supports_multiple_classes_vec() {
+        let mut classes = vec!["class-1"];
+        classes.push("class-2");
+        let a = html! {
+            <div class=classes></div>
+        };
+
+        if let VNode::VTag(vtag) = a {
+            println!("{:?}", vtag.classes);
+            assert!(vtag.classes.contains("class-1"));
+            assert!(vtag.classes.contains("class-2"));
+            assert!(!vtag.classes.contains("class-3"));
+        } else {
+            panic!("vtag expected");
+        }
+    }
+
+    #[test]
+    fn filter_empty_string_classes_vec() {
+        let mut classes = vec![""];
+        classes.push("class-2");
+        let a = html! { <div class=vec![""]></div> };
+        let b = html! { <div class=("")></div> };
+        let c = html! { <div class=""></div> };
+
+        if let VNode::VTag(vtag) = a {
+            assert!(vtag.classes.is_empty());
+        } else {
+            panic!("vtag expected");
+        }
+
+        if let VNode::VTag(vtag) = b {
+            assert!(vtag.classes.is_empty());
+        } else {
+            panic!("vtag expected");
+        }
+
+        if let VNode::VTag(vtag) = c {
+            assert!(vtag.classes.is_empty());
+        } else {
+            panic!("vtag expected");
+        }
+    }
+
+    fn assert_vtag(node: &mut VNode) -> &mut VTag {
+        if let VNode::VTag(vtag) = node {
+            return vtag;
+        }
+        panic!("should be vtag");
+    }
+
+    fn assert_namespace(vtag: &VTag, namespace: &'static str) {
+        assert_eq!(
+            vtag.reference.as_ref().unwrap().namespace_uri().unwrap(),
+            namespace
+        );
+    }
+
+    #[test]
+    fn supports_svg() {
+        let div_el = document().create_element("div").unwrap();
+        let svg_el = document().create_element_ns(SVG_NAMESPACE, "svg").unwrap();
+
+        let mut g_node = html! { <g></g> };
+        let path_node = html! { <path></path> };
+        let mut svg_node = html! { <svg>{path_node}</svg> };
+
+        let svg_tag = assert_vtag(&mut svg_node);
+        svg_tag.apply(&div_el, None, None);
+        assert_namespace(svg_tag, SVG_NAMESPACE);
+        let path_tag = assert_vtag(svg_tag.children.get_mut(0).unwrap());
+        assert_namespace(path_tag, SVG_NAMESPACE);
+
+        let g_tag = assert_vtag(&mut g_node);
+        g_tag.apply(&div_el, None, None);
+        assert_namespace(g_tag, HTML_NAMESPACE);
+        g_tag.reference = None;
+
+        g_tag.apply(&svg_el, None, None);
+        assert_namespace(g_tag, SVG_NAMESPACE);
+    }
+
+    #[test]
+    fn keeps_order_of_classes() {
+        let a = html! {
+            <div class="class-1 class-2   class-3",></div>
+        };
+
+        if let VNode::VTag(vtag) = a {
+            println!("{:?}", vtag.classes);
+            assert_eq!(vtag.classes.to_string(), "class-1 class-2 class-3");
+        }
+    }
+
+    #[test]
+    fn it_compares_values() {
+        let a = html! {
+            <input value="test"/>
+        };
+
+        let b = html! {
+            <input value="test"/>
+        };
+
+        let c = html! {
+            <input value="fail"/>
+        };
+
+        assert_eq!(a, b);
+        assert_ne!(a, c);
+    }
+
+    #[test]
+    fn it_compares_kinds() {
+        let a = html! {
+            <input type="text"/>
+        };
+
+        let b = html! {
+            <input type="text"/>
+        };
+
+        let c = html! {
+            <input type="hidden"/>
+        };
+
+        assert_eq!(a, b);
+        assert_ne!(a, c);
+    }
+
+    #[test]
+    fn it_compares_checked() {
+        let a = html! {
+            <input type="checkbox" checked=false />
+        };
+
+        let b = html! {
+            <input type="checkbox" checked=false />
+        };
+
+        let c = html! {
+            <input type="checkbox" checked=true />
+        };
+
+        assert_eq!(a, b);
+        assert_ne!(a, c);
+    }
+
+    #[test]
+    fn it_allows_aria_attributes() {
+        let a = html! {
+            <p aria-controls="it-works">
+                <a class="btn btn-primary"
+                   data-toggle="collapse"
+                   href="#collapseExample"
+                   role="button"
+                   aria-expanded="false"
+                   aria-controls="collapseExample">
+                    { "Link with href" }
+                </a>
+                <button class="btn btn-primary"
+                        type="button"
+                        data-toggle="collapse"
+                        data-target="#collapseExample"
+                        aria-expanded="false"
+                        aria-controls="collapseExample">
+                    { "Button with data-target" }
+                </button>
+                <div own-attribute-with-multiple-parts="works" />
+            </p>
+        };
+        if let VNode::VTag(vtag) = a {
+            assert!(vtag.attributes.contains_key("aria-controls"));
+            assert_eq!(
+                vtag.attributes.get("aria-controls"),
+                Some(&"it-works".into())
+            );
+        } else {
+            panic!("vtag expected");
+        }
+    }
+
+    #[test]
+    fn it_checks_mixed_closing_tags() {
+        let a = html! { <div> <div/>      </div> };
+        let b = html! { <div> <div></div> </div> };
+        assert_eq!(a, b);
+    }
+
+    #[test]
+    fn it_checks_misleading_gt() {
+        html! { <div data-val=<u32 as Default>::default()></div> };
+        html! { <div data-val=Box::<u32>::default()></div> };
+
+        html! { <div><a data-val=<u32 as Default>::default() /> </div> };
+        html! { <div><a data-val=Box::<u32>::default() /></div> };
+    }
+}
diff --git a/src/virtual_dom/vtext.rs b/src/virtual_dom/vtext.rs
index 97357fcd5eb..40866c72f0d 100644
--- a/src/virtual_dom/vtext.rs
+++ b/src/virtual_dom/vtext.rs
@@ -101,3 +101,43 @@ impl PartialEq for VText {
         self.text == other.text
     }
 }
+
+#[cfg(test)]
+mod test {
+    use crate::{html, Component, ComponentLink, Html, ShouldRender};
+    #[cfg(feature = "wasm_test")]
+    use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
+
+    #[cfg(feature = "wasm_test")]
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    struct Comp;
+
+    impl Component for Comp {
+        type Message = ();
+        type Properties = ();
+
+        fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
+            Comp
+        }
+
+        fn update(&mut self, _: Self::Message) -> ShouldRender {
+            unimplemented!();
+        }
+
+        fn view(&self) -> Html {
+            unimplemented!();
+        }
+    }
+
+    #[test]
+    fn text_as_root() {
+        html! {
+            "Text Node As Root"
+        };
+
+        html! {
+            { "Text Node As Root" }
+        };
+    }
+}
diff --git a/tests/format_test.rs b/tests/format_test.rs
deleted file mode 100644
index 6892a9ba8f9..00000000000
--- a/tests/format_test.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use serde::{Deserialize, Serialize};
-#[cfg(feature = "wasm_test")]
-use wasm_bindgen_test::wasm_bindgen_test as test;
-use yew::format::{Binary, Json, Text};
-
-#[test]
-fn json_format() {
-    #[derive(Serialize, Deserialize)]
-    struct Data {
-        value: u8,
-    }
-
-    let Json(data): Json<Result<Data, _>> = Json::from(Ok(r#"{"value": 123}"#.to_string()));
-    let data = data.unwrap();
-    assert_eq!(data.value, 123);
-
-    let _stored: Text = Json(&data).into();
-    let _stored: Binary = Json(&data).into();
-}
diff --git a/tests/vcomp_test.rs b/tests/vcomp_test.rs
deleted file mode 100644
index f3e99470014..00000000000
--- a/tests/vcomp_test.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-#[cfg(feature = "wasm_test")]
-use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
-use yew::macros::Properties;
-use yew::{html, Component, ComponentLink, Html, ShouldRender};
-
-#[cfg(feature = "wasm_test")]
-wasm_bindgen_test_configure!(run_in_browser);
-
-struct Comp;
-
-#[derive(Clone, PartialEq, Properties)]
-struct Props {
-    field_1: u32,
-    field_2: u32,
-}
-
-impl Component for Comp {
-    type Message = ();
-    type Properties = Props;
-
-    fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
-        Comp
-    }
-
-    fn update(&mut self, _: Self::Message) -> ShouldRender {
-        unimplemented!();
-    }
-
-    fn view(&self) -> Html {
-        unimplemented!();
-    }
-}
-
-#[test]
-fn set_properties_to_component() {
-    html! {
-        <Comp />
-    };
-
-    html! {
-        <Comp field_1=1 />
-    };
-
-    html! {
-        <Comp field_2=2 />
-    };
-
-    html! {
-        <Comp field_1=1 field_2=2 />
-    };
-
-    let props = Props {
-        field_1: 1,
-        field_2: 1,
-    };
-
-    html! {
-        <Comp with props />
-    };
-}
diff --git a/tests/vlist_test.rs b/tests/vlist_test.rs
deleted file mode 100644
index 02bee958017..00000000000
--- a/tests/vlist_test.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-#[cfg(feature = "wasm_test")]
-use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
-use yew::{html, Component, ComponentLink, Html, ShouldRender};
-
-#[cfg(feature = "wasm_test")]
-wasm_bindgen_test_configure!(run_in_browser);
-
-struct Comp;
-
-impl Component for Comp {
-    type Message = ();
-    type Properties = ();
-
-    fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
-        Comp
-    }
-
-    fn update(&mut self, _: Self::Message) -> ShouldRender {
-        unimplemented!();
-    }
-
-    fn view(&self) -> Html {
-        unimplemented!();
-    }
-}
-
-#[test]
-fn check_fragments() {
-    let fragment = html! {
-        <>
-        </>
-    };
-    html! {
-        <div>
-            { fragment }
-        </div>
-    };
-}
diff --git a/tests/vtag_test.rs b/tests/vtag_test.rs
deleted file mode 100644
index 94c6b687cb2..00000000000
--- a/tests/vtag_test.rs
+++ /dev/null
@@ -1,409 +0,0 @@
-#![recursion_limit = "128"]
-use stdweb::web::{document, IElement};
-#[cfg(feature = "wasm_test")]
-use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
-use yew::virtual_dom::vtag::{VTag, HTML_NAMESPACE, SVG_NAMESPACE};
-use yew::virtual_dom::{VDiff, VNode};
-use yew::{html, Component, ComponentLink, Html, ShouldRender};
-
-#[cfg(feature = "wasm_test")]
-wasm_bindgen_test_configure!(run_in_browser);
-
-struct Comp;
-
-impl Component for Comp {
-    type Message = ();
-    type Properties = ();
-
-    fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
-        Comp
-    }
-
-    fn update(&mut self, _: Self::Message) -> ShouldRender {
-        unimplemented!();
-    }
-
-    fn view(&self) -> Html {
-        unimplemented!();
-    }
-}
-
-struct CompInt;
-
-impl Component for CompInt {
-    type Message = u32;
-    type Properties = ();
-
-    fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
-        CompInt
-    }
-
-    fn update(&mut self, _: Self::Message) -> ShouldRender {
-        unimplemented!();
-    }
-
-    fn view(&self) -> Html {
-        unimplemented!();
-    }
-}
-
-struct CompBool;
-
-impl Component for CompBool {
-    type Message = bool;
-    type Properties = ();
-
-    fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
-        CompBool
-    }
-
-    fn update(&mut self, _: Self::Message) -> ShouldRender {
-        unimplemented!();
-    }
-
-    fn view(&self) -> Html {
-        unimplemented!();
-    }
-}
-
-#[test]
-fn it_compares_tags() {
-    let a = html! {
-        <div></div>
-    };
-
-    let b = html! {
-        <div></div>
-    };
-
-    let c = html! {
-        <p></p>
-    };
-
-    assert_eq!(a, b);
-    assert_ne!(a, c);
-}
-
-#[test]
-fn it_compares_text() {
-    let a = html! {
-        <div>{ "correct" }</div>
-    };
-
-    let b = html! {
-        <div>{ "correct" }</div>
-    };
-
-    let c = html! {
-        <div>{ "incorrect" }</div>
-    };
-
-    assert_eq!(a, b);
-    assert_ne!(a, c);
-}
-
-#[test]
-fn it_compares_attributes() {
-    let a = html! {
-        <div a="test"></div>
-    };
-
-    let b = html! {
-        <div a="test"></div>
-    };
-
-    let c = html! {
-        <div a="fail"></div>
-    };
-
-    assert_eq!(a, b);
-    assert_ne!(a, c);
-}
-
-#[test]
-fn it_compares_children() {
-    let a = html! {
-        <div>
-            <p></p>
-        </div>
-    };
-
-    let b = html! {
-        <div>
-            <p></p>
-        </div>
-    };
-
-    let c = html! {
-        <div>
-            <span></span>
-        </div>
-    };
-
-    assert_eq!(a, b);
-    assert_ne!(a, c);
-}
-
-#[test]
-fn it_compares_classes() {
-    let a = html! {
-        <div class="test"></div>
-    };
-
-    let b = html! {
-        <div class="test"></div>
-    };
-
-    let c = html! {
-        <div class="fail"></div>
-    };
-
-    let d = html! {
-        <div class=format!("fail")></div>
-    };
-
-    assert_eq!(a, b);
-    assert_ne!(a, c);
-    assert_eq!(c, d);
-}
-
-#[test]
-fn classes_from_local_variables() {
-    let a = html! {
-        <div class=("class-1", "class-2")></div>
-    };
-
-    let class_2 = "class-2";
-    let b = html! {
-        <div class=("class-1", class_2)></div>
-    };
-
-    let class_2_fmt = format!("class-{}", 2);
-    let c = html! {
-        <div class=("class-1", class_2_fmt)></div>
-    };
-
-    assert_eq!(a, b);
-    assert_eq!(a, c);
-}
-
-#[test]
-fn supports_multiple_classes_string() {
-    let a = html! {
-        <div class="class-1 class-2   class-3"></div>
-    };
-
-    let b = html! {
-        <div class="class-2 class-3 class-1"></div>
-    };
-
-    assert_ne!(a, b);
-
-    if let VNode::VTag(vtag) = a {
-        println!("{:?}", vtag.classes);
-        assert!(vtag.classes.contains("class-1"));
-        assert!(vtag.classes.contains("class-2"));
-        assert!(vtag.classes.contains("class-3"));
-    } else {
-        panic!("vtag expected");
-    }
-}
-
-#[test]
-fn supports_multiple_classes_vec() {
-    let mut classes = vec!["class-1"];
-    classes.push("class-2");
-    let a = html! {
-        <div class=classes></div>
-    };
-
-    if let VNode::VTag(vtag) = a {
-        println!("{:?}", vtag.classes);
-        assert!(vtag.classes.contains("class-1"));
-        assert!(vtag.classes.contains("class-2"));
-        assert!(!vtag.classes.contains("class-3"));
-    } else {
-        panic!("vtag expected");
-    }
-}
-
-#[test]
-fn filter_empty_string_classes_vec() {
-    let mut classes = vec![""];
-    classes.push("class-2");
-    let a = html! { <div class=vec![""]></div> };
-    let b = html! { <div class=("")></div> };
-    let c = html! { <div class=""></div> };
-
-    if let VNode::VTag(vtag) = a {
-        assert!(vtag.classes.is_empty());
-    } else {
-        panic!("vtag expected");
-    }
-
-    if let VNode::VTag(vtag) = b {
-        assert!(vtag.classes.is_empty());
-    } else {
-        panic!("vtag expected");
-    }
-
-    if let VNode::VTag(vtag) = c {
-        assert!(vtag.classes.is_empty());
-    } else {
-        panic!("vtag expected");
-    }
-}
-
-fn assert_vtag(node: &mut VNode) -> &mut VTag {
-    if let VNode::VTag(vtag) = node {
-        return vtag;
-    }
-    panic!("should be vtag");
-}
-
-fn assert_namespace(vtag: &VTag, namespace: &'static str) {
-    assert_eq!(
-        vtag.reference.as_ref().unwrap().namespace_uri().unwrap(),
-        namespace
-    );
-}
-
-#[test]
-fn supports_svg() {
-    let div_el = document().create_element("div").unwrap();
-    let svg_el = document().create_element_ns(SVG_NAMESPACE, "svg").unwrap();
-
-    let mut g_node = html! { <g></g> };
-    let path_node = html! { <path></path> };
-    let mut svg_node = html! { <svg>{path_node}</svg> };
-
-    let svg_tag = assert_vtag(&mut svg_node);
-    svg_tag.apply(&div_el, None, None);
-    assert_namespace(svg_tag, SVG_NAMESPACE);
-    let path_tag = assert_vtag(svg_tag.children.get_mut(0).unwrap());
-    assert_namespace(path_tag, SVG_NAMESPACE);
-
-    let g_tag = assert_vtag(&mut g_node);
-    g_tag.apply(&div_el, None, None);
-    assert_namespace(g_tag, HTML_NAMESPACE);
-    g_tag.reference = None;
-
-    g_tag.apply(&svg_el, None, None);
-    assert_namespace(g_tag, SVG_NAMESPACE);
-}
-
-#[test]
-fn keeps_order_of_classes() {
-    let a = html! {
-        <div class="class-1 class-2   class-3",></div>
-    };
-
-    if let VNode::VTag(vtag) = a {
-        println!("{:?}", vtag.classes);
-        assert_eq!(vtag.classes.to_string(), "class-1 class-2 class-3");
-    }
-}
-
-#[test]
-fn it_compares_values() {
-    let a = html! {
-        <input value="test"/>
-    };
-
-    let b = html! {
-        <input value="test"/>
-    };
-
-    let c = html! {
-        <input value="fail"/>
-    };
-
-    assert_eq!(a, b);
-    assert_ne!(a, c);
-}
-
-#[test]
-fn it_compares_kinds() {
-    let a = html! {
-        <input type="text"/>
-    };
-
-    let b = html! {
-        <input type="text"/>
-    };
-
-    let c = html! {
-        <input type="hidden"/>
-    };
-
-    assert_eq!(a, b);
-    assert_ne!(a, c);
-}
-
-#[test]
-fn it_compares_checked() {
-    let a = html! {
-        <input type="checkbox" checked=false />
-    };
-
-    let b = html! {
-        <input type="checkbox" checked=false />
-    };
-
-    let c = html! {
-        <input type="checkbox" checked=true />
-    };
-
-    assert_eq!(a, b);
-    assert_ne!(a, c);
-}
-
-#[test]
-fn it_allows_aria_attributes() {
-    let a = html! {
-        <p aria-controls="it-works">
-            <a class="btn btn-primary"
-               data-toggle="collapse"
-               href="#collapseExample"
-               role="button"
-               aria-expanded="false"
-               aria-controls="collapseExample">
-                { "Link with href" }
-            </a>
-            <button class="btn btn-primary"
-                    type="button"
-                    data-toggle="collapse"
-                    data-target="#collapseExample"
-                    aria-expanded="false"
-                    aria-controls="collapseExample">
-                { "Button with data-target" }
-            </button>
-            <div own-attribute-with-multiple-parts="works" />
-        </p>
-    };
-    if let VNode::VTag(vtag) = a {
-        assert!(vtag.attributes.contains_key("aria-controls"));
-        assert_eq!(
-            vtag.attributes.get("aria-controls"),
-            Some(&"it-works".into())
-        );
-    } else {
-        panic!("vtag expected");
-    }
-}
-
-#[test]
-fn it_checks_mixed_closing_tags() {
-    let a = html! { <div> <div/>      </div> };
-    let b = html! { <div> <div></div> </div> };
-    assert_eq!(a, b);
-}
-
-#[test]
-fn it_checks_misleading_gt() {
-    html! { <div data-val=<u32 as Default>::default()></div> };
-    html! { <div data-val=Box::<u32>::default()></div> };
-
-    html! { <div><a data-val=<u32 as Default>::default() /> </div> };
-    html! { <div><a data-val=Box::<u32>::default() /></div> };
-}
diff --git a/tests/vtext_test.rs b/tests/vtext_test.rs
deleted file mode 100644
index 25d85a9baeb..00000000000
--- a/tests/vtext_test.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-#[cfg(feature = "wasm_test")]
-use wasm_bindgen_test::{wasm_bindgen_test as test, wasm_bindgen_test_configure};
-use yew::{html, Component, ComponentLink, Html, ShouldRender};
-
-#[cfg(feature = "wasm_test")]
-wasm_bindgen_test_configure!(run_in_browser);
-
-struct Comp;
-
-impl Component for Comp {
-    type Message = ();
-    type Properties = ();
-
-    fn create(_: Self::Properties, _: ComponentLink<Self>) -> Self {
-        Comp
-    }
-
-    fn update(&mut self, _: Self::Message) -> ShouldRender {
-        unimplemented!();
-    }
-
-    fn view(&self) -> Html {
-        unimplemented!();
-    }
-}
-
-#[test]
-fn text_as_root() {
-    html! {
-        "Text Node As Root"
-    };
-
-    html! {
-        { "Text Node As Root" }
-    };
-}