diff --git a/tests/commands_test.rs b/tests/commands_test.rs
index 30aa847998..52c8b2017c 100644
--- a/tests/commands_test.rs
+++ b/tests/commands_test.rs
@@ -1,7 +1,7 @@
 mod helpers;
 
-use helpers as h;
 use h::in_directory as cwd;
+use helpers as h;
 
 #[test]
 fn lines() {
@@ -14,18 +14,22 @@ fn lines() {
 
 #[test]
 fn open_csv() {
-    nu!(output,
+    nu!(
+        output,
         cwd("tests/fixtures/formats"),
-        "open caco3_plastics.csv | get root | first 1 | get origin | echo $it");
+        "open caco3_plastics.csv | get root | first 1 | get origin | echo $it"
+    );
 
     assert_eq!(output, "SPAIN");
 }
 
 #[test]
 fn open_toml() {
-    nu!(output, 
-        cwd("tests/fixtures/formats"), 
-        "open cargo_sample.toml | get package.edition | echo $it");
+    nu!(
+        output,
+        cwd("tests/fixtures/formats"),
+        "open cargo_sample.toml | get package.edition | echo $it"
+    );
 
     assert_eq!(output, "2018");
 }
@@ -41,32 +45,40 @@ fn open_json() {
 
 #[test]
 fn open_xml() {
-    nu!(output,
+    nu!(
+        output,
         cwd("tests/fixtures/formats"),
-        "open jonathan.xml | get rss.channel.item.link | echo $it");
+        "open jonathan.xml | get rss.channel.item.link | echo $it"
+    );
 
-    assert_eq!(output, "http://www.jonathanturner.org/2015/10/off-to-new-adventures.html")
+    assert_eq!(
+        output,
+        "http://www.jonathanturner.org/2015/10/off-to-new-adventures.html"
+    )
 }
 
 #[test]
 fn open_ini() {
-    nu!(output,
+    nu!(
+        output,
         cwd("tests/fixtures/formats"),
-        "open sample.ini | get SectionOne.integer | echo $it");
+        "open sample.ini | get SectionOne.integer | echo $it"
+    );
 
     assert_eq!(output, "1234")
 }
 
 #[test]
 fn open_error_if_file_not_found() {
-    nu_error!(output,
+    nu_error!(
+        output,
         cwd("tests/fixtures/formats"),
-        "open i_dont_exist.txt | echo $it");
+        "open i_dont_exist.txt | echo $it"
+    );
 
     assert!(output.contains("File cound not be opened"));
 }
 
-
 #[test]
 fn rm() {
     let directory = "tests/fixtures/nuplayground";
@@ -74,9 +86,7 @@ fn rm() {
 
     h::create_file_at(&file);
 
-    nu!(_output,
-        cwd(directory),
-        "rm rm_test.txt");
+    nu!(_output, cwd(directory), "rm rm_test.txt");
 
     assert!(!h::file_exists_at(&file));
 }
@@ -85,30 +95,34 @@ fn rm() {
 fn can_remove_directory_contents_with_recursive_flag() {
     let path = "tests/fixtures/nuplayground/rm_test";
 
-    if h::file_exists_at(&path) { h::delete_directory_at(path) }
+    if h::file_exists_at(&path) {
+        h::delete_directory_at(path)
+    }
     h::create_directory_at(path);
 
     for f in ["yehuda.txt", "jonathan.txt", "andres.txt"].iter() {
         h::create_file_at(&format!("{}/{}", path, f));
-    };
+    }
 
-    nu!(_output,
+    nu!(
+        _output,
         cwd("tests/fixtures/nuplayground"),
-        "rm rm_test --recursive");
+        "rm rm_test --recursive"
+    );
 
     assert!(!h::file_exists_at(&path));
 }
 
 #[test]
 fn rm_error_if_attempting_to_delete_a_directory_without_recursive_flag() {
-    let path = "tests/fixtures/nuplayground/rm_test";
+    let path = "tests/fixtures/nuplayground/rm_test_2";
 
-    if h::file_exists_at(&path) { h::delete_directory_at(path) }
+    if h::file_exists_at(&path) {
+        h::delete_directory_at(path)
+    }
     h::create_directory_at(path);
 
-    nu_error!(output,
-        cwd("tests/fixtures/nuplayground"),
-        "rm rm_test");
+    nu_error!(output, cwd("tests/fixtures/nuplayground"), "rm rm_test_2");
 
     assert!(h::file_exists_at(&path));
     assert!(output.contains("is a directory"));
@@ -117,18 +131,14 @@ fn rm_error_if_attempting_to_delete_a_directory_without_recursive_flag() {
 
 #[test]
 fn rm_error_if_attempting_to_delete_single_dot_as_argument() {
-    nu_error!(output,
-        cwd("tests/fixtures/nuplayground"),
-        "rm .");
+    nu_error!(output, cwd("tests/fixtures/nuplayground"), "rm .");
 
     assert!(output.contains("may not be removed"));
 }
 
 #[test]
 fn rm_error_if_attempting_to_delete_two_dot_as_argument() {
-    nu_error!(output,
-        cwd("tests/fixtures/nuplayground"),
-        "rm ..");
+    nu_error!(output, cwd("tests/fixtures/nuplayground"), "rm ..");
 
     assert!(output.contains("may not be removed"));
 }