diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 37583fa..059332f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -28,11 +28,11 @@
                 "ms-python.flake8",
                 "eamodio.gitlens",
                 "github.vscode-pull-request-github",
-                "dbaeumer.vscode-eslint",
                 "lfm.vscode-makefile-term",
                 "streetsidesoftware.code-spell-checker",
                 "timonwong.shellcheck",
-                "github.vscode-github-actions"
+                "github.vscode-github-actions",
+                "tamasfe.even-better-toml"
             ],
             "settings": {
                 "python.defaultInterpreterPath": "/home/vscode/.asdf/shims/python",
diff --git a/src/eps_spine_shared/common/dynamodb_client.py b/src/eps_spine_shared/common/dynamodb_client.py
index 5c173fa..88b6203 100644
--- a/src/eps_spine_shared/common/dynamodb_client.py
+++ b/src/eps_spine_shared/common/dynamodb_client.py
@@ -70,10 +70,10 @@ def __init__(
 
             resource_args = {"service_name": SERVICE_NAME, "region_name": REGION_NAME}
             if aws_endpoint_url:
-                log_object.write_log("DDB0003", None, {"awsEndpointUrl": aws_endpoint_url})
+                self.log_object.write_log("DDB0003", None, {"awsEndpointUrl": aws_endpoint_url})
                 resource_args["endpoint_url"] = aws_endpoint_url
             else:
-                log_object.write_log("DDB0004", None)
+                self.log_object.write_log("DDB0004", None)
 
             self.resource = session.resource(**resource_args)
             self.table = self.resource.Table(table_name)
@@ -82,7 +82,7 @@ def __init__(
             self.deserialiser = TypeDeserializer()
             self.serialiser = TypeSerializer()
         except Exception as ex:
-            log_object.write_log("DDB0000", sys.exc_info(), {"error": str(ex)})
+            self.log_object.write_log("DDB0000", sys.exc_info(), {"error": str(ex)})
             raise ex
 
         self.log_object.write_log("DDB0001", None, {"tableName": table_name})
diff --git a/tests/mock_logger.py b/src/eps_spine_shared/testing/mock_logger.py
similarity index 100%
rename from tests/mock_logger.py
rename to src/eps_spine_shared/testing/mock_logger.py
diff --git a/tests/common/dynamodb_datastore_test.py b/tests/common/dynamodb_datastore_test.py
index b9aa249..95dfb35 100644
--- a/tests/common/dynamodb_datastore_test.py
+++ b/tests/common/dynamodb_datastore_test.py
@@ -25,8 +25,8 @@
 from eps_spine_shared.common.dynamodb_datastore import EpsDynamoDbDataStore
 from eps_spine_shared.common.prescription.record import PrescriptionStatus
 from eps_spine_shared.nhsfundamentals.timeutilities import TimeFormats
+from eps_spine_shared.testing.mock_logger import MockLogObject
 from tests.dynamodb_test import DynamoDbTest
-from tests.mock_logger import MockLogObject
 
 
 class EpsDynamoDbDataStoreTest(DynamoDbTest):
diff --git a/tests/common/indexes_test.py b/tests/common/indexes_test.py
index 9982101..31a1bcf 100644
--- a/tests/common/indexes_test.py
+++ b/tests/common/indexes_test.py
@@ -11,7 +11,7 @@
 from eps_spine_shared.common.prescription.repeat_prescribe import RepeatPrescribeRecord
 from eps_spine_shared.common.prescription.single_prescribe import SinglePrescribeRecord
 from eps_spine_shared.common.prescription.types import PrescriptionTreatmentType
-from tests.mock_logger import MockLogObject
+from eps_spine_shared.testing.mock_logger import MockLogObject
 
 
 def get_nad_references():
diff --git a/tests/common/prescription/record_test.py b/tests/common/prescription/record_test.py
index 436bd38..1f0a53d 100644
--- a/tests/common/prescription/record_test.py
+++ b/tests/common/prescription/record_test.py
@@ -12,7 +12,7 @@
 from eps_spine_shared.common.prescription.types import PrescriptionTreatmentType
 from eps_spine_shared.errors import EpsSystemError
 from eps_spine_shared.nhsfundamentals.timeutilities import TimeFormats
-from tests.mock_logger import MockLogObject
+from eps_spine_shared.testing.mock_logger import MockLogObject
 
 
 def load_test_example_json(mock_log_object, filename):
diff --git a/tests/dynamodb_test.py b/tests/dynamodb_test.py
index b12a679..f1c1e95 100644
--- a/tests/dynamodb_test.py
+++ b/tests/dynamodb_test.py
@@ -13,7 +13,7 @@
 from eps_spine_shared.common.dynamodb_common import SortKey
 from eps_spine_shared.common.dynamodb_datastore import EpsDynamoDbDataStore
 from eps_spine_shared.common.prescription.record import PrescriptionStatus
-from tests.mock_logger import MockLogObject
+from eps_spine_shared.testing.mock_logger import MockLogObject
 
 PRESC_ORG = "X26"
 DISP_ORG = "X27"