diff --git a/login_server/src/cpp/test/controller/TestHederaAccount.cpp b/login_server/src/cpp/test/controller/TestHederaAccount.cpp
deleted file mode 100644
index aaeaea723..000000000
--- a/login_server/src/cpp/test/controller/TestHederaAccount.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "TestHederaAccount.h"
-#include "../../SingletonManager/ConnectionManager.h"
-namespace controller {
-
-	void TestHederaAccount::SetUp()
-	{
-
-	}
-
-	TEST_F(TestHederaAccount, TestPick) {
-		auto hedera_account = controller::HederaAccount::pick(ServerConfig::HEDERA_TESTNET, false);
-		EXPECT_FALSE(hedera_account.isNull());
-	}
-}
diff --git a/login_server/src/cpp/test/controller/TestHederaAccount.h b/login_server/src/cpp/test/controller/TestHederaAccount.h
deleted file mode 100644
index 721ba17e8..000000000
--- a/login_server/src/cpp/test/controller/TestHederaAccount.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "gtest/gtest.h"
-
-#include "../../controller/HederaAccount.h"
-
-
-namespace controller {
-
-	class TestHederaAccount : public ::testing::Test {
-	protected:
-		void SetUp() override;
-	};
-
-}
diff --git a/login_server/src/cpp/test/controller/TestHederaId.cpp b/login_server/src/cpp/test/controller/TestHederaId.cpp
deleted file mode 100644
index d08dc7e59..000000000
--- a/login_server/src/cpp/test/controller/TestHederaId.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "TestHederaId.h"
-#include "../../SingletonManager/ConnectionManager.h"
-namespace controller {
-
-	void TestHederaId::SetUp()
-	{
-
-	}
-
-	TEST_F(TestHederaId, TestFindTopicId) {
-		auto hedera_topic_id = controller::HederaId::find(1, ServerConfig::HEDERA_TESTNET);
-		EXPECT_FALSE(hedera_topic_id.isNull());
-	}
-}
diff --git a/login_server/src/cpp/test/controller/TestHederaId.h b/login_server/src/cpp/test/controller/TestHederaId.h
deleted file mode 100644
index e19b56862..000000000
--- a/login_server/src/cpp/test/controller/TestHederaId.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "gtest/gtest.h"
-
-#include "../../controller/HederaId.h"
-
-
-namespace controller {
-
-	class TestHederaId : public ::testing::Test {
-	protected:
-		void SetUp() override;
-	};
-
-}
diff --git a/login_server/src/cpp/test/controller/TestHederaTopic.cpp b/login_server/src/cpp/test/controller/TestHederaTopic.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/login_server/src/cpp/test/controller/TestHederaTopic.h b/login_server/src/cpp/test/controller/TestHederaTopic.h
deleted file mode 100644
index e69de29bb..000000000