diff --git a/tools/test_modules/m00050.pm b/tools/test_modules/m00050.pm
index fc924068d..a094908af 100644
--- a/tools/test_modules/m00050.pm
+++ b/tools/test_modules/m00050.pm
@@ -16,9 +16,9 @@ sub module_constraints { [[0, 256], [0, 256], [0, 55], [0, 55], [0, 55]] }
 sub module_generate_hash
 {
   my $word = shift;
-  my $salt = shift);
+  my $salt = shift;
 
-  my $digest = hmac_hex ($salt, $word, \&md5, 64) . ":$salt";
+  my $digest = hmac_hex ($salt, $word, \&md5, 64);
 
   my $hash = sprintf ("%s:%s", $digest, $salt);
 
diff --git a/tools/test_modules/m00060.pm b/tools/test_modules/m00060.pm
index 1042e0f3e..b2fa99aa5 100644
--- a/tools/test_modules/m00060.pm
+++ b/tools/test_modules/m00060.pm
@@ -18,7 +18,7 @@ sub module_generate_hash
   my $word = shift;
   my $salt = shift;
 
-  my $digest = hmac_hex ($word, $salt, \&md5, 64) . ":$salt";
+  my $digest = hmac_hex ($word, $salt, \&md5, 64);
 
   my $hash = sprintf ("%s:%s", $digest, $salt);
 
diff --git a/tools/test_modules/m05600.pm b/tools/test_modules/m05600.pm
index cc9d3b7c9..f2f8fa88a 100644
--- a/tools/test_modules/m05600.pm
+++ b/tools/test_modules/m05600.pm
@@ -68,30 +68,11 @@ sub module_verify_hash
 
   my $word_packed = pack_if_HEX_notation ($word);
 
-  my $new_hash = module_generate_hash ($word_packed_packed, $user, $domain, $srv_ch, $cli_ch);
-
-  # resolve lowercase/uppercase ambiguity in the username
-  # this will also guarantee a match with the preprocessed hashlist
-  $hash     = lc $hash;
-  $new_hash = lc $new_hash;
-
-  return unless $new_hash eq $hash;
+  my $new_hash = module_generate_hash ($word_packed, $user, $domain, $srv_ch, $cli_ch);
 
   return ($new_hash, $word);
 }
 
-# algorithm is case-insensitive in regard to usernames
-# hashcat output always is uppercase, while real world hashes are not
-sub module_preprocess_hashlist
-{
-  my $hashlist = shift;
-
-  for my $hash (@{$hashlist})
-  {
-    $hash = lc $hash;
-  }
-}
-
 sub random_client_challenge
 {
   my $ch;
diff --git a/tools/test_modules/m18400.pm b/tools/test_modules/m18400.pm
index 672dbf2a4..fa3bd65f7 100644
--- a/tools/test_modules/m18400.pm
+++ b/tools/test_modules/m18400.pm
@@ -102,7 +102,7 @@ sub module_verify_hash
   my $b_plain   = $cbc->decrypt ($b_cipher, $key, $b_iv);
   my $plain     = unpack ('H*', $b_plain);
 
-  my $new_hash = module_generate_hash ($word_packed_packed, $salt, $iter, $iv, $plain);
+  my $new_hash = module_generate_hash ($word_packed, $salt, $iter, $iv, $plain);
 
   return ($new_hash, $word);
 }
diff --git a/tools/test_modules/m18600.pm b/tools/test_modules/m18600.pm
index a9f718725..cf3c28b57 100644
--- a/tools/test_modules/m18600.pm
+++ b/tools/test_modules/m18600.pm
@@ -128,7 +128,7 @@ sub module_verify_hash
 
   my $plain = unpack ('H*', $b_plain);
 
-  my $new_hash = module_generate_hash ($word_packed_packed, $salt, $iter, $iv, $plain);
+  my $new_hash = module_generate_hash ($word_packed, $salt, $iter, $iv, $plain);
 
   return ($new_hash, $word);
 }