diff --git a/openbb_sdk/sdk/core/openbb_core/app/service/hub_service.py b/openbb_sdk/sdk/core/openbb_core/app/service/hub_service.py
index 9611f0f9220..ee5c4d37548 100644
--- a/openbb_sdk/sdk/core/openbb_core/app/service/hub_service.py
+++ b/openbb_sdk/sdk/core/openbb_core/app/service/hub_service.py
@@ -1,3 +1,4 @@
+"""Hub manager class."""
 from typing import Optional
 
 import requests
@@ -11,11 +12,11 @@ from openbb_core.app.model.user_settings import UserSettings
 
 
 class OpenBBError(Exception):
-    pass
+    """OpenBB error."""
 
 
 class HubService:
-    """Hub manager class"""
+    """Manage Hub service class."""
 
     BASE_URL = "https://payments.openbb.dev"
     TIMEOUT = 10
diff --git a/openbb_sdk/sdk/core/openbb_core/app/service/journal_service.py b/openbb_sdk/sdk/core/openbb_core/app/service/journal_service.py
index 085f80bd533..b75bf03d1eb 100644
--- a/openbb_sdk/sdk/core/openbb_core/app/service/journal_service.py
+++ b/openbb_sdk/sdk/core/openbb_core/app/service/journal_service.py
@@ -1,3 +1,4 @@
+"""Journal service."""
 from typing import Optional
 
 from openbb_core.app.repository.abstract.journal_entry_repository import (
@@ -92,12 +93,15 @@ class JournalService:
 
     @property
     def mongodb_client(self) -> Optional[MongoClient]:
+        """Return mongodb client."""
         return self._mongodb_client
 
     @property
     def journal_entry_repository(self) -> AbstractJournalEntryRepository:
+        """Return journal entry repository."""
         return self._journal_entry_repository
 
     @property
     def journal_repository(self) -> AbstractJournalRepository:
+        """Return journal repository."""
         return self._journal_repository
diff --git a/openbb_sdk/sdk/core/tests/app/service/test_hub_service.py b/openbb_sdk/sdk/core/tests/app/service/test_hub_service.py
new file mode 100644
index 00000000000..a6bab27c696
--- /dev/null
+++ b/openbb_sdk/sdk/core/tests/app/service/test_hub_service.py
@@ -0,0 +1,164 @@
+"""Test the hub_service.py module."""
+
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from openbb_core.app.service.hub_service import (
+    Credentials,
+    HubService,
+    HubSession,
+    HubUserSettings,
+    OpenBBError,
+)
+
+
+@pytest.fixture
+def mocker():
+    """Fixture for mocker."""
+    with patch("openbb_core.app.service.hub_service.HubService") as mock:
+        yield mock
+
+
+def test_connect_with_email_password():
+    """Test connect with email and password."""
+    mock_hub_session = MagicMock(spec=HubSession)
+    with patch(
+        "requests.post", return_value=MagicMock(status_code=200, json=lambda: {})
+    ):
+        with patch.object(
+            HubService, "get_session_from_email_password", return_value=mock_hub_session
+        ):
+            hub_service = HubService()
+            result = hub_service.connect(email="test@example.com", password="password")
+
+            assert result == mock_hub_session
+            assert hub_service.session == mock_hub_session
+
+
+def test_connect_with_sdk_token():
+    """Test connect with SDK personal access token."""
+    mock_hub_session = MagicMock(spec=HubSession)
+    with patch(
+        "requests.post", return_value=MagicMock(status_code=200, json=lambda: {})
+    ):
+        with patch.object(
+            HubService, "get_session_from_sdk_token", return_value=mock_hub_session
+        ):
+            hub_service = HubService()
+            result = hub_service.connect(sdk_token="sdk_token")
+
+            assert result == mock_hub_session
+            assert hub_service.session == mock_hub_session
+
+
+def test_connect_without_credentials():
+    """Test connect without credentials."""
+    hub_service = HubService()
+    with pytest.raises(
+        OpenBBError, match="Please provide 'email' and 'password' or 'sdk_token'"
+    ):
+        hub_service.connect()
+
+
+@patch("requests.post")
+def test_get_session_from_email_password(mock_post):
+    """Test get session from email and password."""
+    mock_post.return_value = MagicMock(
+        status_code=200,
+        json=lambda: {
+            "access_token": "token",
+            "token_type": "Bearer",
+            "uuid": "uuid",
+            "email": "email",
+            "username": "username",
+            "primary_usage": "primary_usage",
+        },
+    )
+    result = HubService.get_session_from_email_password("email", "password")
+    assert isinstance(result, HubSession)
+
+
+@patch("requests.post")
+def test_get_session_from_sdk_token(mock_post):
+    """Test get session from SDK personal access token."""
+    mock_post.return_value = MagicMock(
+        status_code=200,
+        json=lambda: {
+            "access_token": "token",
+            "token_type": "Bearer",
+            "uuid": "uuid",
+            "username": "username",
+            "email": "email",
+            "primary_usage": "primary_usage",
+        },
+    )
+    result = HubService.get_session_from_sdk_token("token")
+    assert isinstance(result, HubSession)
+
+
+@patch("requests.get")
+def test_disconnect(mock_get):
+    """Test disconnect."""
+    mock_get.return_value = MagicMock(status_code=200, json=lambda: {"success": True})
+    mock_hub_session = MagicMock(
+        spec=HubSession, access_token="token", token_type="Bearer"
+    )
+    hub_service = HubService(session=mock_hub_session)
+
+    assert hub_service.disconnect() is True
+    assert hub_service.session is None
+
+
+@patch("requests.get")
+def test_get_user_settings(mock_get):
+    """Test get user settings."""
+    mock_get.return_value = MagicMock(status_code=200, json=lambda: {})
+    mock_hub_session = MagicMock(
+        spec=HubSession, access_token="token", token_type="Bearer"
+    )
+
+    user_settings = HubService.get_user_settings(mock_hub_session)
+    assert isinstance(user_settings, HubUserSettings)
+
+
+@patch("requests.put")
+def test_put_user_settings(mock_put):
+    """Test put user settings."""
+    mock_put.return_value = MagicMock(status_code=200)
+    mock_hub_session = MagicMock(
+        spec=HubSession, access_token="token", token_type="Bearer"
+    )
+    mock_user_settings = MagicMock(spec=HubUserSettings)
+
+    assert HubService.put_user_settings(mock_hub_session, mock_user_settings) is True
+
+
+def test_hub2sdk():
+    """Test hub2sdk."""
+    mock_user_settings = MagicMock(spec=HubUserSettings)
+    mock_user_settings.features_keys = MagicMock(
+        API_KEY_FINANCIALMODELINGPREP="fmp",
+        API_POLYGON_KEY="polygon",
+        API_FRED_KEY="fred",
+    )
+
+    credentials = HubService.hub2sdk(mock_user_settings)
+    assert isinstance(credentials, Credentials)
+    assert credentials.fmp_api_key == "fmp"
+    assert credentials.polygon_api_key == "polygon"
+    assert credentials.fred_api_key == "fred"
+
+
+def test_sdk2hub():
+    """Test sdk2hub."""
+    mock_credentials = MagicMock(spec=Credentials)
+    mock_credentials.fmp_api_key = "fmp"
+    mock_credentials.polygon_api_key = "polygon"
+    mock_credentials.fred_api_key = "fred"
+
+    user_settings = HubService.sdk2hub(mock_credentials)
+    assert isinstance(user_settings, HubUserSettings)
+    assert user_settings.features_keys.API_KEY_FINANCIALMODELINGPREP == "fmp"
+    assert user_settings.features_keys.API_POLYGON_KEY == "polygon"
+    assert user_settings.features_keys.API_FRED_KEY == "fred"
diff --git a/openbb_sdk/sdk/core/tests/test_service_journal_service.py b/openbb_sdk/sdk/core/tests/app/service/test_journal_service.py
similarity index 97%
rename from openbb_sdk/sdk/core/tests/test_service_journal_service.py
rename to openbb_sdk/sdk/core/tests/app/service/test_journal_service.py
index b22edab68f6..2e735c43d17 100644
--- a/openbb_sdk/sdk/core/tests/test_service_journal_service.py
+++ b/openbb_sdk/sdk/core/tests/app/service/test_journal_service.py
@@ -1,4 +1,4 @@
-"""Test the ../openbb_core/app/service/journal_service.py module."""
+"""Test the journal_service.py module."""
 # pylint: disable=redefined-outer-name
 
 from unittest.mock import MagicMock
diff --git a/openbb_sdk/sdk/core/tests/test_service_system_service.py b/openbb_sdk/sdk/core/tests/app/service/test_system_service.py
similarity index 95%
rename from openbb_sdk/sdk/core/tests/test_service_system_service.py
rename to openbb_sdk/sdk/core/tests/app/service/test_system_service.py
index 79e6c4a0ab2..6b42c18c581 100644
--- a/openbb_sdk/sdk/core/tests/test_service_system_service.py
+++ b/openbb_sdk/sdk/core/tests/app/service/test_system_service.py
@@ -1,4 +1,4 @@
-"""Test the ../openbb_core/app/service/system_service.py module."""
+"""Test the system_service.py module."""
 # pylint: disable=redefined-outer-name
 
 import pytest
diff --git a/openbb_sdk/sdk/core/tests/test_service_user_service.py b/openbb_sdk/sdk/core/tests/app/service/test_user_service.py
similarity index 98%
rename from openbb_sdk/sdk/core/tests/test_service_user_service.py
rename to openbb_sdk/sdk/core/tests/app/service/test_user_service.py
index b8c2d0532d6..11b3ee4ba7f 100644
--- a/openbb_sdk/sdk/core/tests/test_service_user_service.py
+++ b/openbb_sdk/sdk/core/tests/app/service/test_user_service.py
@@ -1,4 +1,4 @@
-"""Test the ../app/service/user_service.py module."""
+"""Test the user_service.py module."""
 
 from pathlib import Path
 from unittest.mock import MagicMock
diff --git a/openbb_sdk/sdk/core/tests/test_static_app_factory.py b/openbb_sdk/sdk/core/tests/app/static/test_app_factory.py
similarity index 100%
rename from openbb_sdk/sdk/core/tests/test_static_app_factory.py
rename to openbb_sdk/sdk/core/tests/app/static/test_app_factory.py
diff --git a/openbb_sdk/sdk/core/tests/test_static_container.py b/openbb_sdk/sdk/core/tests/app/static/test_container.py
similarity index 78%
rename from openbb_sdk/sdk/core/tests/test_static_container.py
rename to openbb_sdk/sdk/core/tests/app/static/test_container.py
index 5329647c988..dc1e01b2801 100644
--- a/openbb_sdk/sdk/core/tests/test_static_container.py
+++ b/openbb_sdk/sdk/core/tests/app/static/test_container.py
@@ -1,4 +1,4 @@
-"""Test the app/static/container.py file."""
+"""Test the container.py file."""
 
 from openbb_core.app.static.container import Container
 
diff --git a/openbb_sdk/sdk/core/tests/test_static_coverage.py b/openbb_sdk/sdk/core/tests/app/static/test_coverage.py
similarity index 93%
rename from openbb_sdk/sdk/core/tests/test_static_coverage.py
rename to openbb_sdk/sdk/core/tests/app/static/test_coverage.py
index 123751e31a9..2131d24cefb 100644
--- a/openbb_sdk/sdk/core/tests/test_static_coverage.py
+++ b/openbb_sdk/sdk/core/tests/app/static/test_coverage.py
@@ -1,4 +1,4 @@
-"""Test the app/static/coverage.py file."""
+"""Test the coverage.py file."""
 # pylint: disable=redefined-outer-name
 
 import pytest
diff --git a/openbb_sdk/sdk/core/tests/test_static_filters.py b/openbb_sdk/sdk/core/tests/app/static/test_filters.py
similarity index 95%
rename from openbb_sdk/sdk/core/tests/test_static_filters.py
rename to openbb_sdk/sdk/core/tests/app/static/test_filters.py
index 642244e8f08..5b014933991 100644
--- a/openbb_sdk/sdk/core/tests/test_static_filters.py
+++ b/openbb_sdk/sdk/core/tests/app/static/test_filters.py
@@ -1,4 +1,4 @@
-"""Test the app/static/filters.py file."""
+"""Test the filters.py file."""
 
 import pytest
 from openbb_core.app.model.command_output import CommandOutput
diff --git a/openbb_sdk/sdk/core/tests/test_static_package_builder.py b/openbb_sdk/sdk/core/tests/app/static/test_package_builder.py
similarity index 99%
rename from openbb_sdk/sdk/core/tests/test_static_package_builder.py
rename to openbb_sdk/sdk/core/tests/app/static/test_package_builder.py
index 7e075d011e2..e922fa1cf3a 100644
--- a/openbb_sdk/sdk/core/tests/test_static_package_builder.py
+++ b/openbb_sdk/sdk/core/tests/app/static/test_package_builder.py
@@ -1,4 +1,4 @@
-"""Test the app/static/package_builder.py file."""
+"""Test the package_builder.py file."""
 # pylint: disable=redefined-outer-name
 
 from dataclasses import dataclass