diff --git a/pallets/dapp-staking-v3/src/test/testing_utils.rs b/pallets/dapp-staking-v3/src/test/testing_utils.rs
index 999122bdb..1d03a8a4d 100644
--- a/pallets/dapp-staking-v3/src/test/testing_utils.rs
+++ b/pallets/dapp-staking-v3/src/test/testing_utils.rs
@@ -703,9 +703,14 @@ pub(crate) fn assert_unstake(
         );
 
         let is_loyal = pre_staker_info.is_loyal()
-            && !(unstake_subperiod == Subperiod::BuildAndEarn
-                && post_staker_info.staked_amount(Subperiod::Voting)
-                    < pre_staker_info.staked_amount(Subperiod::Voting));
+            && match unstake_subperiod {
+                Subperiod::Voting => !post_staker_info.staked_amount(Subperiod::Voting).is_zero(),
+                Subperiod::BuildAndEarn => {
+                    post_staker_info.staked_amount(Subperiod::Voting)
+                        == pre_staker_info.staked_amount(Subperiod::Voting)
+                }
+            };
+
         assert_eq!(
             post_staker_info.is_loyal(),
             is_loyal,
@@ -782,7 +787,7 @@ pub(crate) fn assert_claim_staker_rewards(account: AccountId) {
         .earliest_staked_era()
         .expect("Entry must exist, otherwise 'claim' is invalid.");
 
-    // Get the apprropriate era rewards span for the 'first era'
+    // Get the appropriate era rewards span for the 'first era'
     let era_span_length: EraNumber = <Test as Config>::EraRewardSpanLength::get();
     let era_span_index = first_claim_era - (first_claim_era % era_span_length);
     let era_rewards_span = pre_snapshot
diff --git a/pallets/dapp-staking-v3/src/test/tests_types.rs b/pallets/dapp-staking-v3/src/test/tests_types.rs
index 9d9a5d2e7..91d18964c 100644
--- a/pallets/dapp-staking-v3/src/test/tests_types.rs
+++ b/pallets/dapp-staking-v3/src/test/tests_types.rs
@@ -382,7 +382,7 @@ fn account_ledger_staked_amount_for_type_works() {
         build_and_earn_1
     );
 
-    // Inocrrect period should simply return 0
+    // Incorrect period should simply return 0
     assert!(acc_ledger
         .staked_amount_for_type(Subperiod::Voting, period - 1)
         .is_zero());
@@ -816,7 +816,7 @@ fn account_ledger_add_stake_amount_too_large_amount_fails() {
         Err(AccountLedgerError::UnavailableStakeFunds)
     );
 
-    // Additional check - have some active stake, and then try to overstake
+    // Additional check - have some active stake, and then try to stake more than available
     assert!(acc_ledger
         .add_stake_amount(lock_amount - 2, era_1, period_info_1)
         .is_ok());
@@ -2113,7 +2113,7 @@ fn singular_staking_info_unstake_during_voting_is_ok() {
         "Stake era should remain valid."
     );
 
-    // Fully unstake, attempting to undersaturate, and ensure loyalty flag is still true.
+    // Fully unstake, attempting to underflow, and ensure loyalty flag has been removed.
     let era_2 = era_1 + 2;
     let remaining_stake = staking_info.total_staked_amount();
     assert_eq!(
@@ -2121,7 +2121,10 @@ fn singular_staking_info_unstake_during_voting_is_ok() {
         (remaining_stake, Balance::zero())
     );
     assert!(staking_info.total_staked_amount().is_zero());
-    assert!(staking_info.is_loyal());
+    assert!(
+        !staking_info.is_loyal(),
+        "Loyalty flag should have been removed since it was full unstake."
+    );
     assert_eq!(staking_info.era(), era_2);
 }
 
@@ -2507,7 +2510,7 @@ fn contract_stake_amount_unstake_is_ok() {
     );
     assert!(
         contract_stake.staked_future.is_none(),
-        "future enry should remain 'None'"
+        "future entry should remain 'None'"
     );
 
     // 4th scenario - do a full unstake with existing future entry, expect a cleanup
diff --git a/pallets/dapp-staking-v3/src/types.rs b/pallets/dapp-staking-v3/src/types.rs
index 1e9f2ac99..5216a5b79 100644
--- a/pallets/dapp-staking-v3/src/types.rs
+++ b/pallets/dapp-staking-v3/src/types.rs
@@ -1045,8 +1045,10 @@ impl SingularStakingInfo {
         self.staked.era = self.staked.era.max(current_era);
 
         self.loyal_staker = self.loyal_staker
-            && (subperiod == Subperiod::Voting
-                || subperiod == Subperiod::BuildAndEarn && self.staked.voting == snapshot.voting);
+            && match subperiod {
+                Subperiod::Voting => !self.staked.voting.is_zero(),
+                Subperiod::BuildAndEarn => self.staked.voting == snapshot.voting,
+            };
 
         // Amount that was unstaked
         (