diff --git a/.docker/Dockerfile_pre_test b/.docker/Dockerfile_pre_test
new file mode 100644
index 000000000..6e0af4987
--- /dev/null
+++ b/.docker/Dockerfile_pre_test
@@ -0,0 +1,9 @@
+FROM rust:1.58-buster
+
+RUN apt update
+RUN apt install -y libglib2.0-dev libgtk-3-dev libsoup2.4-dev libappindicator3-dev libwebkit2gtk-4.0-dev firefox-esr
+
+RUN cargo install cargo-make --debug
+RUN cargo install cargo-cache && cargo cache -a
+
+CMD ["echo","\"base image built\""]
diff --git a/.docker/Dockerfile_test b/.docker/Dockerfile_test
new file mode 100644
index 000000000..f6265c2bb
--- /dev/null
+++ b/.docker/Dockerfile_test
@@ -0,0 +1,8 @@
+FROM dioxus-base-test-image
+
+RUN mkdir run_test
+COPY tmp /run_test
+WORKDIR /run_test
+RUN cargo make tests
+
+CMD ["exit"]
diff --git a/.docker/README.md b/.docker/README.md
new file mode 100644
index 000000000..57578f405
--- /dev/null
+++ b/.docker/README.md
@@ -0,0 +1,27 @@
+# Why this?
+
+This part is used to test whole package before pushing it
+
+# How to use it?
+
+Just run in the folder:
+`bash run_local_tests.sh`. If nothing fails, then you can push your code to the repo.
+or run:
+`bash run_local_tests.sh --with-full-docker-cleanup`
+for cleaning up images as well
+
+# How is it composed of?
+
+  1. `Dockerfile_pre_test` will build the base image for the tests to be run into
+  2. `Dockerfile_test` will run the actual tests based on 1.
+  3. `run_local_tests.sh` to wrap this up
+
+# Warning
+
+The task requires some amount of CPU work and disk space (5GB per tests). Some clean up is included in the script.
+
+# Requirements
+
+ * [docker](https://docs.docker.com/engine/install/)
+ * bash
+ * rsync
\ No newline at end of file
diff --git a/.docker/run_local_tests.sh b/.docker/run_local_tests.sh
new file mode 100644
index 000000000..804d87afb
--- /dev/null
+++ b/.docker/run_local_tests.sh
@@ -0,0 +1,38 @@
+set -eux
+
+echo "Test script started"
+
+function run_script {
+    if [[ -d tmp ]]
+    then
+        rm -rf tmp
+    fi
+    mkdir tmp
+    # copy files first
+    rsync -a --progress ../ tmp --exclude target --exclude docker
+
+    # build base image
+    docker build -f Dockerfile_pre_test -t dioxus-base-test-image .
+    # run test
+    docker build -f Dockerfile_test -t dioxus-test-image .
+
+    # clean up
+    rm -rf tmp
+    if [ $# -ge 1 ]
+    then
+        echo "Got some parameter"
+        if [ $1 = "--with-full-docker-cleanup" ]
+        then
+        docker image rm dioxus-base-test-image
+        docker image rm dioxus-test-image
+        docker system prune -af
+        fi
+    fi
+}
+
+run_script || echo "Error occured.. cleaning a bit." && \
+    docker system prune -af;
+
+docker system prune -af
+
+echo "Script finished to execute"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b941960b7..4ab05df1c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,10 +33,16 @@ jobs:
       - uses: Swatinem/rust-cache@v1
       - run: sudo apt-get update
       - run: sudo apt install libwebkit2gtk-4.0-dev libappindicator3-dev libgtk-3-dev
-      - uses: actions-rs/cargo@v1
+      - name: Install cargo-make
+        uses: actions-rs/cargo@v1
         with:
-          command: test
-          args: --features "desktop, ssr, router"
+          command: install
+          args: --debug cargo-make
+      - uses: actions-rs/cargo@v1
+      - uses: browser-actions/setup-firefox@latest
+        with:
+          command: make
+          args: tests
 
   fmt:
     name: Rustfmt
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ac2195ccd..44bcb08e3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,4 +4,8 @@
     "desktop",
     "router"
   ],
+  "editor.formatOnSave": true,
+  "[toml]": {
+    "editor.formatOnSave": false
+  }
 }
diff --git a/Makefile.toml b/Makefile.toml
new file mode 100644
index 000000000..95abec9de
--- /dev/null
+++ b/Makefile.toml
@@ -0,0 +1,42 @@
+[config]
+default_to_workspace = false
+min_version = "0.32.4"
+
+[env]
+CARGO_MAKE_CLIPPY_ARGS = "-- --deny=warnings"
+CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
+
+[config.modify_core_tasks]
+namespace = "core"
+private = true
+
+[tasks.tests]
+category = "Testing"
+dependencies = ["tests-setup"]
+description = "Run all tests"
+env = {CARGO_MAKE_WORKSPACE_SKIP_MEMBERS = ["**/examples/*", "**/packages/changelog"]}
+run_task = {name = ["test-flow"], fork = true}
+
+[tasks.tests-setup]
+private = true
+script = [
+  """
+    test_flags = array --headless --firefox
+    dioxus_test_features = set wasm_test
+    dioxus_test_flags = array_join ${test_flags} " "
+    echo "running tests with flags: ${dioxus_test_flags} and features: ${dioxus_test_features}"
+    set_env DIOXUS_TEST_FLAGS ${dioxus_test_flags}
+    set_env DIOXUS_TEST_FEATURES ${dioxus_test_features}
+    """,
+]
+script_runner = "@duckscript"
+
+[tasks.test-flow]
+dependencies = ["test"]
+private = true
+workspace = true
+
+[tasks.test]
+args = ["test", "--all-targets", "--workspace", "--exclude", "dioxus-mobile"]
+command = "cargo"
+private = true
diff --git a/packages/desktop/examples/async.rs b/packages/desktop/examples/async.rs
index 064ef1960..0668834f9 100644
--- a/packages/desktop/examples/async.rs
+++ b/packages/desktop/examples/async.rs
@@ -1,4 +1,4 @@
-use dioxus::prelude::*;
+/* use dioxus::prelude::*;
 use dioxus_core as dioxus;
 use dioxus_core_macro::*;
 use dioxus_hooks::*;
@@ -32,3 +32,4 @@ fn app(cx: Scope) -> Element {
         }
     })
 }
+ */
diff --git a/packages/mobile/Cargo.toml b/packages/mobile/Cargo.toml
index 9da440343..cdf0a5c05 100644
--- a/packages/mobile/Cargo.toml
+++ b/packages/mobile/Cargo.toml
@@ -13,3 +13,8 @@ license = "MIT/Apache-2.0"
 
 [dependencies]
 dioxus-desktop = { path = "../desktop", version = "^0.1.6" }
+
+[lib]
+doctest = false
+# tests suspended until package ready
+test = false
diff --git a/packages/mobile/Makefile.toml b/packages/mobile/Makefile.toml
new file mode 100644
index 000000000..90f08a170
--- /dev/null
+++ b/packages/mobile/Makefile.toml
@@ -0,0 +1,7 @@
+[tasks.test]
+command = "cargo"
+args = [
+  "test",
+  "--no-run",
+]
+
diff --git a/packages/router/Cargo.toml b/packages/router/Cargo.toml
index 1c6ed24d2..239a3c5d8 100644
--- a/packages/router/Cargo.toml
+++ b/packages/router/Cargo.toml
@@ -43,9 +43,18 @@ web = ["web-sys", "gloo", "js-sys", "wasm-bindgen"]
 desktop = []
 mobile = []
 derive = []
+wasm_test = []
 
 [dev-dependencies]
 console_error_panic_hook = "0.1.7"
 dioxus-web = { path = "../web" }
 log = "0.4.14"
 wasm-logger = "0.2.0"
+wasm-bindgen-test = "0.3"
+gloo-utils = "0.1.2"
+
+[dev-dependencies.web-sys]
+version = "0.3"
+features = [
+    "Document",
+]
diff --git a/packages/router/Makefile.toml b/packages/router/Makefile.toml
new file mode 100644
index 000000000..063585c98
--- /dev/null
+++ b/packages/router/Makefile.toml
@@ -0,0 +1,10 @@
+[tasks.test]
+extend = "core::wasm-pack-base"
+command = "wasm-pack"
+args = [
+  "test",
+  "@@split(DIOXUS_TEST_FLAGS, )",
+  "--",
+  "--features",
+  "${DIOXUS_TEST_FEATURES}",
+]
diff --git a/packages/router/tests/route.rs b/packages/router/tests/route.rs
new file mode 100644
index 000000000..89b7a64fa
--- /dev/null
+++ b/packages/router/tests/route.rs
@@ -0,0 +1,63 @@
+#![cfg(target_arch = "wasm32")]
+
+use dioxus_core::prelude::*;
+use dioxus_core_macro::*;
+use dioxus_html as dioxus_elements;
+use dioxus_router::*;
+use gloo_utils::document;
+use serde::{Deserialize, Serialize};
+use wasm_bindgen_test::*;
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+#[wasm_bindgen_test]
+fn simple_test() {
+    fn main() {
+        console_error_panic_hook::set_once();
+        wasm_logger::init(wasm_logger::Config::new(log::Level::Debug));
+        dioxus_web::launch(APP);
+    }
+
+    static APP: Component = |cx| {
+        cx.render(rsx! {
+            Router {
+                onchange: move |route| log::info!("route changed to {}", route),
+                Route { to: "/", Home {} }
+                Route { to: "blog"
+                    Route { to: "/", BlogList {} }
+                    Route { to: ":id", BlogPost {} }
+                }
+            }
+        })
+    };
+
+    fn Home(cx: Scope) -> Element {
+        cx.render(rsx! {
+            div {
+                h1 { "Home" }
+            }
+        })
+    }
+
+    fn BlogList(cx: Scope) -> Element {
+        cx.render(rsx! {
+            div {
+
+            }
+        })
+    }
+
+    fn BlogPost(cx: Scope) -> Element {
+        let id = use_route(&cx).segment::<usize>("id")?;
+
+        cx.render(rsx! {
+            div {
+
+            }
+        })
+    }
+
+    main();
+
+    let element = gloo_utils::document();
+}
diff --git a/packages/router/webdriver.json b/packages/router/webdriver.json
new file mode 100644
index 000000000..81413f24b
--- /dev/null
+++ b/packages/router/webdriver.json
@@ -0,0 +1,11 @@
+{
+    "moz:firefoxOptions": {
+      "binary": "/usr/bin/firefox",
+      "prefs": {
+        "media.navigator.streams.fake": true,
+        "media.navigator.permission.disabled": true
+      },
+      "args": []
+    }
+  }
+  
\ No newline at end of file