diff --git a/tests/test_add.bats b/tests/test_add.bats
index 81bd1ba0..27c0a0c6 100644
--- a/tests/test_add.bats
+++ b/tests/test_add.bats
@@ -72,7 +72,7 @@ function teardown {
   # https://github.com/sobolevn/git-secret/issues/85 task 1
 
   if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
-    skip "this test is skiped while 'git commmit'"
+    skip "this test is skipped while 'git commmit'"
   fi
 
   # Preparations:
@@ -105,7 +105,7 @@ function teardown {
 
 @test "run 'add' for relative path" {
   if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
-    skip "this test is skiped while 'git commmit'"
+    skip "this test is skipped while 'git commmit'"
   fi
 
   # Prepations:
diff --git a/tests/test_cat.bats b/tests/test_cat.bats
index 91000f1f..1c17efe0 100644
--- a/tests/test_cat.bats
+++ b/tests/test_cat.bats
@@ -38,7 +38,7 @@ function teardown {
 }
 
 @test "run 'cat' with wrong filename" {
-  run git secret reveal -d "$TEST_GPG_HOMEDIR" -p "$password" NO_SUCH_FILE
+  run git secret cat -d "$TEST_GPG_HOMEDIR" -p "$password" NO_SUCH_FILE
   [ "$status" -eq 2 ]
 }
 
diff --git a/tests/test_init.bats b/tests/test_init.bats
index 579d83ed..2a212731 100644
--- a/tests/test_init.bats
+++ b/tests/test_init.bats
@@ -35,7 +35,7 @@ function teardown {
   # https://github.com/sobolevn/git-secret/issues/83
 
   if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
-    skip "this test is skiped while 'git commmit'"
+    skip "this test is skipped while 'git commmit'"
   fi
 
   # Preparations
diff --git a/tests/test_remove.bats b/tests/test_remove.bats
index 27a82c55..7a4bb9db 100644
--- a/tests/test_remove.bats
+++ b/tests/test_remove.bats
@@ -55,11 +55,11 @@ function _has_line {
   [ "$other_files" -eq 0 ]
 
   # Both files should be present:
-  local first_enctypted_file=$(_get_encrypted_filename $FIRST_FILE)
-  local second_enctypted_file=$(_get_encrypted_filename $SECOND_FILE)
+  local first_encrypted_file=$(_get_encrypted_filename $FIRST_FILE)
+  local second_encrypted_file=$(_get_encrypted_filename $SECOND_FILE)
 
-  [ -f "$first_enctypted_file" ]
-  [ -f "$second_enctypted_file" ]
+  [ -f "$first_encrypted_file" ]
+  [ -f "$second_encrypted_file" ]
 }
 
 
@@ -74,11 +74,11 @@ function _has_line {
   [ "$second_line" -eq 1 ]
 
   # Both files should be present:
-  local first_enctypted_file=$(_get_encrypted_filename $FIRST_FILE)
-  local second_enctypted_file=$(_get_encrypted_filename $SECOND_FILE)
+  local first_encrypted_file=$(_get_encrypted_filename $FIRST_FILE)
+  local second_encrypted_file=$(_get_encrypted_filename $SECOND_FILE)
 
-  [ -f "$first_enctypted_file" ]
-  [ -f "$second_enctypted_file" ]
+  [ -f "$first_encrypted_file" ]
+  [ -f "$second_encrypted_file" ]
 }
 
 
@@ -101,8 +101,8 @@ function _has_line {
   local mapping_contains=$(_has_line "$file_in_folder")
   [ "$mapping_contains" -eq 1 ]
 
-  local enctypted_file=$(_get_encrypted_filename $file_in_folder)
-  [ -f "$enctypted_file" ]
+  local encrypted_file=$(_get_encrypted_filename $file_in_folder)
+  [ -f "$encrypted_file" ]
 
   # Cleaning up:
   rm -r "$folder"
@@ -118,11 +118,11 @@ function _has_line {
   local mapping_contains=$(_has_line "$SECOND_FILE")
   [ "$mapping_contains" -eq 1 ]
 
-  local first_enctypted_file=$(_get_encrypted_filename $FIRST_FILE)
-  local second_enctypted_file=$(_get_encrypted_filename $SECOND_FILE)
+  local first_encrypted_file=$(_get_encrypted_filename $FIRST_FILE)
+  local second_encrypted_file=$(_get_encrypted_filename $SECOND_FILE)
   echo "$output"
-  echo "$first_enctypted_file and $second_enctypted_file"
+  echo "$first_encrypted_file and $second_encrypted_file"
 
-  [ -f "$first_enctypted_file" ]
-  [ ! -f "$second_enctypted_file" ]
+  [ -f "$first_encrypted_file" ]
+  [ ! -f "$second_encrypted_file" ]
 }
diff --git a/tests/test_tell.bats b/tests/test_tell.bats
index 8b36cd01..af4e7650 100644
--- a/tests/test_tell.bats
+++ b/tests/test_tell.bats
@@ -126,7 +126,7 @@ function teardown {
 
 @test "run 'tell' in subfolder" {
   if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
-    skip "this test is skiped while 'git commmit'"
+    skip "this test is skipped while 'git commmit'"
   fi
 
   # Preparations
diff --git a/tests/test_whoknows.bats b/tests/test_whoknows.bats
index ef5253ef..72747a1c 100644
--- a/tests/test_whoknows.bats
+++ b/tests/test_whoknows.bats
@@ -34,7 +34,7 @@ function teardown {
 
 @test "run 'whoknows' in subfolder" {
   if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
-    skip "this test is skiped while 'git commmit'"
+    skip "this test is skipped while 'git commmit'"
   fi
 
   # Preparations:
diff --git a/utils/hooks/pre-commit.sh b/utils/hooks/pre-commit.sh
index 8dfecfb4..700040bd 100755
--- a/utils/hooks/pre-commit.sh
+++ b/utils/hooks/pre-commit.sh
@@ -8,7 +8,7 @@ if [[ "$BRANCH_NAME" != '(no branch)' ]]; then
   unset GIT_WORK_TREE
 
   # Set marker, that we running tests from `git commit`,
-  # so some tests will be skiped. It is done, because `git rev-parse`
+  # so some tests will be skipped. It is done, because `git rev-parse`
   # is not working when running from pre-commit hook.
   export BATS_RUNNING_FROM_GIT=1