3 files changed, 2 insertions, 41 deletions
diff --git a/tests/unit_tests/crypto.cpp b/tests/unit_tests/crypto.cpp
index d9a7b8ad5..3a8e787ec 100644
--- a/tests/unit_tests/crypto.cpp
+++ b/tests/unit_tests/crypto.cpp
@@ -47,14 +47,6 @@ namespace
     "8b655970153799af2aeadc9ff1add0ea6c7251d54154cfa92c173a0dd39c1f94"
     "6c7251d54154cfa92c173a0dd39c1f948b655970153799af2aeadc9ff1add0ea";
 
-  static std::uint8_t md[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00
-  };
-
   template<typename T>
   bool is_formatted()
   {
@@ -69,22 +61,6 @@ namespace
     out << "BEGIN" << value << "END";  
     return out.str() == "BEGIN<" + std::string{expected, sizeof(T) * 2} + ">END";
   }
-
-  bool keccak_harness()
-  {
-    size_t inlen = sizeof(source);
-    int mdlen = (int)sizeof(md);
-    keccak(source, inlen, md, mdlen);
-
-    if (md[0] != 0x00)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-  }
 }
 
 TEST(Crypto, Ostream)
diff --git a/tests/unit_tests/memwipe.cpp b/tests/unit_tests/memwipe.cpp
index b2b19fbf5..2d8980ef7 100644
--- a/tests/unit_tests/memwipe.cpp
+++ b/tests/unit_tests/memwipe.cpp
@@ -47,7 +47,7 @@ static void test(bool wipe)
   if ((intptr_t)quux == foop)
   {
     MDEBUG(std::hex << std::setw(8) << std::setfill('0') << *(uint32_t*)quux);
-    if (wipe) ASSERT_TRUE(!memcmp(quux, "\0\0\0", 3));
+    if (wipe) ASSERT_TRUE(memcmp(quux, "bar", 3));
   }
   else MWARNING("We did not get the same location, cannot check");
   free(quux);
diff --git a/tests/unit_tests/subaddress.cpp b/tests/unit_tests/subaddress.cpp
index c304b7347..ca950b25d 100644
--- a/tests/unit_tests/subaddress.cpp
+++ b/tests/unit_tests/subaddress.cpp
@@ -44,7 +44,7 @@ class WalletSubaddress : public ::testing::Test
     {
       try
       {
-        w1.generate(wallet_name, password, recovery_key, true, false);
+        w1.generate("", password, recovery_key, true, false);
       }
       catch (const std::exception& e)
       {
@@ -58,24 +58,9 @@ class WalletSubaddress : public ::testing::Test
 
     virtual void TearDown()
     {
-      boost::filesystem::wpath wallet_file(wallet_name);
-      boost::filesystem::wpath wallet_address_file(wallet_name + ".address.txt");
-      boost::filesystem::wpath wallet_keys_file(wallet_name + ".keys");
-
-      if ( boost::filesystem::exists(wallet_file) )
-        boost::filesystem::remove(wallet_file);
-
-      if ( boost::filesystem::exists(wallet_address_file) )
-        boost::filesystem::remove(wallet_address_file);
-
-      if ( boost::filesystem::exists(wallet_keys_file) )
-        boost::filesystem::remove(wallet_keys_file);
     }
 
     tools::wallet2 w1;
-    std::string path_working_dir = ".";
-    std::string path_test_wallet = "test_wallet";
-    const std::string wallet_name = path_working_dir + "/" + path_test_wallet;
     const std::string password = "testpass";
     crypto::secret_key recovery_key = crypto::secret_key();
     const std::string test_label = "subaddress test label";