diff --git a/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/SignInEmailAndPasswordViewModelTest.kt b/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/SignInEmailAndPasswordViewModelTest.kt
index 78919d8..a685535 100644
--- a/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/SignInEmailAndPasswordViewModelTest.kt
+++ b/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/SignInEmailAndPasswordViewModelTest.kt
@@ -97,7 +97,7 @@ class SignInEmailAndPasswordViewModelTest {
 
     viewModel.updatePassword("")
 
-    assertTrue(viewModel.hasInvalidDataEmail())
+    assertTrue(viewModel.hasInvalidDataPassword())
   }
 
   @Test
@@ -106,7 +106,7 @@ class SignInEmailAndPasswordViewModelTest {
 
     viewModel.updatePassword("1234567")
 
-    assertTrue(viewModel.hasInvalidDataEmail())
+    assertTrue(viewModel.hasInvalidDataPassword())
   }
 }
 
diff --git a/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/SignUpViewModelTest.kt b/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/SignUpViewModelTest.kt
index ccd9dc2..00f01d2 100644
--- a/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/SignUpViewModelTest.kt
+++ b/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/SignUpViewModelTest.kt
@@ -109,7 +109,7 @@ class SignUpViewModelTest {
 
     viewModel.updatePassword("1234567")
 
-    assertTrue(viewModel.hasInvalidDataEmail())
+    assertTrue(viewModel.hasInvalidDataPassword())
   }
 }
 
diff --git a/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_settings/item_tag_detail/ItemTagEditViewModelTest.kt b/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_settings/item_tag_detail/ItemTagEditViewModelTest.kt
index 10a1aa2..c36c3dd 100644
--- a/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_settings/item_tag_detail/ItemTagEditViewModelTest.kt
+++ b/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_settings/item_tag_detail/ItemTagEditViewModelTest.kt
@@ -129,6 +129,19 @@ class ItemTagEditViewModelTest {
     assertTrue(viewModel.hasInvalidData())
   }
 
+  @Test
+  fun whitespaceOnlyName_isInvalid() = runTest {
+    backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
+
+    itemTagRepository.sendItemTag(testInputItemTag)
+    viewModel.reload()
+
+    viewModel.updateName("   ")
+
+    assertTrue(viewModel.hasInvalidDataName())
+    assertTrue(viewModel.hasInvalidData())
+  }
+
   @Test
   fun nameWithSymbolsAndUnicode_isValid() = runTest {
     backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
diff --git a/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_settings/item_tag_list/ItemTagCreateViewModelTest.kt b/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_settings/item_tag_list/ItemTagCreateViewModelTest.kt
index 2381950..0e08bba 100644
--- a/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_settings/item_tag_list/ItemTagCreateViewModelTest.kt
+++ b/app/src/test/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/shop_settings/item_tag_list/ItemTagCreateViewModelTest.kt
@@ -81,6 +81,16 @@ class ItemTagCreateViewModelTest {
     assertTrue(viewModel.hasInvalidData())
   }
 
+  @Test
+  fun whitespaceOnlyName_isInvalid() = runTest {
+    backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
+
+    viewModel.updateName("   ")
+
+    assertTrue(viewModel.hasInvalidDataName())
+    assertTrue(viewModel.hasInvalidData())
+  }
+
   @Test
   fun singleCharacterName_isValid() = runTest {
     backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }