diff --git a/cpp/FileTransferAgent.cpp b/cpp/FileTransferAgent.cpp
index 793584ea48..69fd783953 100755
--- a/cpp/FileTransferAgent.cpp
+++ b/cpp/FileTransferAgent.cpp
@@ -77,12 +77,14 @@ Snowflake::Client::FileTransferAgent::FileTransferAgent(
   m_getFastFail(false)
 {
   _mutex_init(&m_parallelTokRenewMutex);
+  _mutex_init(&m_parallelFailedMsgMutex);
 }
 
 Snowflake::Client::FileTransferAgent::~FileTransferAgent()
 {
   reset();
   _mutex_term(&m_parallelTokRenewMutex);
+  _mutex_term(&m_parallelFailedMsgMutex);
 }
 
 void Snowflake::Client::FileTransferAgent::reset()
diff --git a/tests/test_unit_cred_renew.cpp b/tests/test_unit_cred_renew.cpp
index a5e6964a19..af82bce0ec 100644
--- a/tests/test_unit_cred_renew.cpp
+++ b/tests/test_unit_cred_renew.cpp
@@ -458,10 +458,8 @@ int main(void) {
     cmocka_unit_test(test_token_renew_small_files),
     cmocka_unit_test(test_token_renew_large_file),
     cmocka_unit_test(test_token_renew_get_remote_meta),
-#ifndef __aarch64__
     cmocka_unit_test(test_transfer_exception_upload),
     cmocka_unit_test(test_transfer_exception_download)
-#endif
   };
   int ret = cmocka_run_group_tests(tests, gr_setup, NULL);
   return ret;
diff --git a/tests/test_unit_put_fast_fail.cpp b/tests/test_unit_put_fast_fail.cpp
index 3f64fe102e..0a51dbd6e1 100644
--- a/tests/test_unit_put_fast_fail.cpp
+++ b/tests/test_unit_put_fast_fail.cpp
@@ -235,14 +235,6 @@ class MockedStorageClient : public Snowflake::Client::IStorageClient
 
 void test_put_fast_fail_core(bool successWithRetry)
 {
-  // sdk issue 340
-  // temporariy disable this test case on Linux otherwise it would be a blocker
-  // for changing build environment to centos7. Will get it back when issue 340
-  // is fixed.
-#ifdef __linux__
-    return;
-#endif
-
   std::string matchDir = getTestFileMatchDir();
   matchDir += "*.csv";
   IStorageClient * client = new MockedStorageClient();
@@ -299,14 +291,6 @@ void test_put_fast_fail_core(bool successWithRetry)
 
 void test_get_fast_fail_core(bool successWithRetry)
 {
-  // sdk issue 340
-  // temporariy disable this test case on Linux otherwise it would be a blocker
-  // for changing build environment to centos7. Will get it back when issue 340
-  // is fixed.
-#ifdef __linux__
-    return;
-#endif
-
   std::string matchDir = getTestFileMatchDir();
   IStorageClient * client = new MockedStorageClient();
   StorageClientFactory::injectMockedClient(client);