diff --git a/template_yarte/Cargo.toml b/template_yarte/Cargo.toml
index be056ced..67f31b33 100644
--- a/template_yarte/Cargo.toml
+++ b/template_yarte/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "template_yarte"
 version = "0.0.1"
-authors = ["Rust-iendo Barcelona <riendocontributions@gmail.com>"]
+authors = ["Rust-iendo <riendocontributions@gmail.com>"]
 publish = false
 edition = "2018"
 
@@ -12,12 +12,10 @@ env_logger = "0.6"
 
 yarte = { version = "0.2", features=["with-actix-web"]  }
 
-actix-web = "1.0.0"
+actix-web = "1.0"
 
 [build-dependencies]
 yarte = { version = "0.2", features=["with-actix-web"]  }
 
 [dev-dependencies]
 bytes = "0.4"
-actix-http-test = "0.2.0"
-actix-http = "0.2.3"
diff --git a/template_yarte/README.md b/template_yarte/README.md
index 0f3d2756..1aabc641 100644
--- a/template_yarte/README.md
+++ b/template_yarte/README.md
@@ -1,6 +1,6 @@
 # yarte
 
-Example of composition with partials and `with-actix-web` feature
+Minimal example of using template [yarte](https://gitlab.com/r-iendo/yarte) that displays a form.
 
 ```bash
 cargo test
diff --git a/template_yarte/src/main.rs b/template_yarte/src/main.rs
index d65a091d..6a7faa0c 100644
--- a/template_yarte/src/main.rs
+++ b/template_yarte/src/main.rs
@@ -30,25 +30,24 @@ fn main() -> std::io::Result<()> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use actix_http::HttpService;
-    use actix_http_test::TestServer;
-    use actix_web::{http, App};
+    use actix_web::{http, test as atest};
     use bytes::Bytes;
 
     #[test]
     fn test() {
-        let mut srv = TestServer::new(|| HttpService::new(App::new().service(index)));
+        let mut app = atest::init_service(App::new().service(index));
 
-        let req = srv.get("/");
-        let mut response = srv.block_on(req.send()).unwrap();
-        assert!(response.status().is_success());
+        let req = atest::TestRequest::with_uri("/").to_request();
+        let resp = atest::call_service(&mut app, req);
+
+        assert!(resp.status().is_success());
 
         assert_eq!(
-            response.headers().get(http::header::CONTENT_TYPE).unwrap(),
+            resp.headers().get(http::header::CONTENT_TYPE).unwrap(),
             "text/html"
         );
 
-        let bytes = srv.block_on(response.body()).unwrap();
+        let bytes = atest::read_body(resp);
         assert_eq!(
             bytes,
             Bytes::from_static(
@@ -67,16 +66,17 @@ mod test {
             )
         );
 
-        let req = srv.get("/?name=foo&lastname=bar");
-        let mut response = srv.block_on(req.send()).unwrap();
-        assert!(response.status().is_success());
+        let req = atest::TestRequest::with_uri("/?name=foo&lastname=bar").to_request();
+        let resp = atest::call_service(&mut app, req);
+
+        assert!(resp.status().is_success());
 
         assert_eq!(
-            response.headers().get(http::header::CONTENT_TYPE).unwrap(),
+            resp.headers().get(http::header::CONTENT_TYPE).unwrap(),
             "text/html"
         );
 
-        let bytes = srv.block_on(response.body()).unwrap();
+        let bytes = atest::read_body(resp);
         assert_eq!(
             bytes,
             Bytes::from_static(
@@ -90,20 +90,22 @@ mod test {
             )
         );
 
-        let req = srv.get("/?name=foo");
-        let mut response = srv.block_on(req.send()).unwrap();
-        assert!(response.status().is_server_error());
+        let req = atest::TestRequest::with_uri("/?name=foo").to_request();
+        let resp = atest::call_service(&mut app, req);
 
-        let req = srv.get("/?lastname=bar");
-        let mut response = srv.block_on(req.send()).unwrap();
-        assert!(response.status().is_success());
+        assert!(resp.status().is_server_error());
+
+        let req = atest::TestRequest::with_uri("/?lastname=bar").to_request();
+        let resp = atest::call_service(&mut app, req);
+
+        assert!(resp.status().is_success());
 
         assert_eq!(
-            response.headers().get(http::header::CONTENT_TYPE).unwrap(),
+            resp.headers().get(http::header::CONTENT_TYPE).unwrap(),
             "text/html"
         );
 
-        let bytes = srv.block_on(response.body()).unwrap();
+        let bytes = atest::read_body(resp);
         assert_eq!(
             bytes,
             Bytes::from_static(