diff --git a/test/services/test_netbox.py b/test/services/test_netbox.py
index 4b5bbf0e8926a2f86e05a90ce40b587aa2ea7f06..f1932030f3a8211e92467fae8e1bdb8b0999ff5d 100644
--- a/test/services/test_netbox.py
+++ b/test/services/test_netbox.py
@@ -8,7 +8,7 @@ from unittest.mock import patch, Mock
 import pytest
 from pynetbox.core.response import Record
 
-from gso.services.netbox_client import NetBoxClient
+from gso.services.netbox_client import NetboxClient
 from gso.products.product_blocks.site import SiteTier
 from gso.utils.exceptions import WorkflowStateError
 
@@ -41,7 +41,7 @@ def site():
 
 @pytest.fixture(scope="module")
 def device_bay():
-    values = {"id": 1, "name": "test123"}
+    values = {"id": 1, "name": "bay_test", "position": 1}
     return Record(values, None, None)
 
 
@@ -62,21 +62,6 @@ def interface():
     return Record(values, None, None)
 
 
-@pytest.fixture(scope="module")
-def app():
-    app = Mock()
-    app.token = "abc123"
-    app.base_url = "http://localhost:8080/testing/api"
-    return app
-
-
-@pytest.fixture(scope="module")
-def endpoint():
-    endpoint = Mock()
-    endpoint.name = "test-endpoint"
-    return endpoint
-
-
 @patch("gso.services.netbox_client.pynetbox.api")
 def test_create_device(mock_api,
                        device,
@@ -99,7 +84,7 @@ def test_create_device(mock_api,
     mock_api.return_value.dcim.module_types.get.return_value = card_type
     mock_api.return_value.dcim.module_types.create.return_value = card_type
 
-    new_device = NetBoxClient().create_device(device_name, site_tier)
+    new_device = NetboxClient().create_device(device_name, site_tier)
     assert new_device is not None
     assert new_device.name == device_name
 
@@ -120,7 +105,7 @@ def test_get_available_lags(mock_api, mock_from_subscription, data_config_filena
     mock_router = mock_subscription.router
     mock_router.router_fqdn = "test_router"
 
-    netbox_client = NetBoxClient()
+    netbox_client = NetboxClient()
     result = netbox_client.get_available_lags(router_id)
 
     # Check the result of the function
@@ -134,7 +119,7 @@ def test_create_interface(mock_api, device, interface, data_config_filename: Pat
     mock_api.return_value.dcim.interfaces.create.return_value = interface
 
     # Create new interface
-    new_interface = NetBoxClient().create_interface(interface.name,
+    new_interface = NetboxClient().create_interface(interface.name,
                                                     interface.type,
                                                     interface.speed,
                                                     device.name)
@@ -162,7 +147,7 @@ def test_reserve_interface_exception(mock_api, device, interface, data_config_fi
 
 # Check exception
     with pytest.raises(WorkflowStateError) as test_exception:
-        NetBoxClient().reserve_interface(device.name, interface.name)
+        NetboxClient().reserve_interface(device.name, interface.name)
         assert str(test_exception.value) == exception_message
 
 
@@ -184,7 +169,7 @@ def test_reserve_interface(mock_api, device, interface, data_config_filename: Pa
     interface.save = mock_save
 
     # Check reservation of interface
-    updated_interface = NetBoxClient().reserve_interface(device.name, interface.name)
+    updated_interface = NetboxClient().reserve_interface(device.name, interface.name)
 
     assert updated_interface is not None
     assert updated_interface.enabled is True