diff --git a/legal-api/src/legal_api/services/authz.py b/legal-api/src/legal_api/services/authz.py
index 735d23667d..527ae89658 100644
--- a/legal-api/src/legal_api/services/authz.py
+++ b/legal-api/src/legal_api/services/authz.py
@@ -983,7 +983,7 @@ def add_allowable_filing_type(is_allowable: bool = False,
 
 
 def are_digital_credentials_allowed(business: Business, jwt: JwtManager):
-    """Return True if the business is allowed to have/view a digital business card."""
+    """Return True if the business is allowed to have/view digital credentials."""
     if not (token := pyjwt.decode(jwt.get_token_auth_header(), options={'verify_signature': False})):
         return False
 
@@ -1002,7 +1002,7 @@ def are_digital_credentials_allowed(business: Business, jwt: JwtManager):
 
 
 def is_self_registered_owner_operator(business, user):
-    """Return True if the user is the owner operator of the business."""
+    """Return True if the user is the self-registered owner operator of the business."""
     if not (registration_filing := get_registration_filing(business)):
         return False
 
diff --git a/legal-api/tests/unit/services/test_authorization.py b/legal-api/tests/unit/services/test_authorization.py
index fb0fd30a1b..a0e1b985ec 100644
--- a/legal-api/tests/unit/services/test_authorization.py
+++ b/legal-api/tests/unit/services/test_authorization.py
@@ -22,6 +22,7 @@
 from datetime import datetime as _datetime
 from enum import Enum
 from http import HTTPStatus
+from typing import Union
 import jwt as pyjwt
 
 import pytest
@@ -3269,7 +3270,7 @@ def test_is_self_registered_owner_operator_false_when_no_registration_filing(app
     user = factory_user(username='test', firstname='Test', lastname='User')
     business = create_business('SP', Business.State.ACTIVE)
 
-    assert is_self_registered_owner_operator(business, user) is False
+    assert is_self_registered_owner_operator(user, business) is False
 
 
 def test_is_self_registered_owner_operator_false_when_no_proprietors(app, session):
@@ -3346,7 +3347,7 @@ def test_is_self_registered_owner_operator_false_when_parties_not_matching(app,
     business = create_business('SP', Business.State.ACTIVE)
     completing_party_role = create_party_role(
         PartyRole.RoleTypes.COMPLETING_PARTY,
-        **create_test_user('1')
+        **create_test_user(suffix='1')
     )
     filing = factory_completed_filing(
         business=business,
@@ -3359,7 +3360,7 @@ def test_is_self_registered_owner_operator_false_when_parties_not_matching(app,
 
     proprietor_party_role = create_party_role(
         PartyRole.RoleTypes.PROPRIETOR,
-        **create_test_user('2')
+        **create_test_user(suffix='2')
     )
     proprietor_party_role.business_id = business.id
     proprietor_party_role.save()
@@ -3372,7 +3373,7 @@ def test_is_self_registered_owner_operator_false_when_user_not_matching(app, ses
     business = create_business('SP', Business.State.ACTIVE)
     completing_party_role = create_party_role(
         PartyRole.RoleTypes.COMPLETING_PARTY,
-        **create_test_user('2')
+        **create_test_user(suffix='2')
     )
     filing = factory_completed_filing(
         business=business,
@@ -3385,7 +3386,7 @@ def test_is_self_registered_owner_operator_false_when_user_not_matching(app, ses
 
     proprietor_party_role = create_party_role(
         PartyRole.RoleTypes.PROPRIETOR,
-        **create_test_user('2')
+        **create_test_user(suffix='2')
     )
     proprietor_party_role.business_id = business.id
     proprietor_party_role.save()
@@ -3398,7 +3399,7 @@ def test_is_self_registered_owner_operator_false_when_proprietor_uses_middle_nam
     business = create_business('SP', Business.State.ACTIVE)
     completing_party_role = create_party_role(
         PartyRole.RoleTypes.COMPLETING_PARTY,
-        **create_test_user(first_name='TEST', last_name='USER')
+        **create_test_user(first_name='TEST', last_name='USER', default_middle=False)
     )
     filing = factory_completed_filing(
         business=business,
@@ -3411,7 +3412,7 @@ def test_is_self_registered_owner_operator_false_when_proprietor_uses_middle_nam
 
     proprietor_party_role = create_party_role(
         PartyRole.RoleTypes.PROPRIETOR,
-        **create_test_user(first_name='TEST', middle_initial='TU', last_name='USER')
+        **create_test_user()
     )
     proprietor_party_role.business_id = business.id
     proprietor_party_role.save()
@@ -3424,7 +3425,7 @@ def test_is_self_registered_owner_operator_true_when_proprietor_and_user_uses_mi
     business = create_business('SP', Business.State.ACTIVE)
     completing_party_role = create_party_role(
         PartyRole.RoleTypes.COMPLETING_PARTY,
-        **create_test_user(first_name='TEST TU', last_name='USER')
+        **create_test_user(first_name='TEST TU', last_name='USER', default_middle=False)
     )
     filing = factory_completed_filing(
         business=business,
@@ -3450,7 +3451,7 @@ def test_is_self_registered_owner_operator_true(app, session):
     business = create_business('SP', Business.State.ACTIVE)
     completing_party_role = create_party_role(
         PartyRole.RoleTypes.COMPLETING_PARTY,
-        **create_test_user(first_name='TEST', last_name='USER')
+        **create_test_user(first_name='TEST', last_name='USER', default_middle=False)
     )
     filing = factory_completed_filing(
         business=business,
@@ -3463,7 +3464,7 @@ def test_is_self_registered_owner_operator_true(app, session):
 
     proprietor_party_role = create_party_role(
         PartyRole.RoleTypes.PROPRIETOR,
-        **create_test_user(first_name='TEST', last_name='USER')
+        **create_test_user(first_name='TEST', last_name='USER', default_middle=False)
     )
     proprietor_party_role.business_id = business.id
     proprietor_party_role.save()
@@ -3542,17 +3543,15 @@ def create_party_role(role=PartyRole.RoleTypes.COMPLETING_PARTY,
     return party_role
 
 
-def create_test_user(suffix=''):
-    return {
-        'first_name': f'TEST{suffix}',
-        'last_name': f'USER{suffix}',
-        'middle_initial': f'TU{suffix}'
-    }
-
+def create_test_user(first_name: Union[str, None] = None, last_name: Union[str, None] = None,
+                     middle_initial: Union[str, None] = None, suffix: Union[str, None] = '',
+                     default_first: bool = True, default_last: bool = True, default_middle: bool = True):
+    first = first_name or ('TEST' if default_first else None)
+    last = last_name or ('USER' if default_last else None)
+    middle = middle_initial or ('TU' if default_middle else None)
 
-def create_test_user(first_name=None, last_name=None, middle_initial=None):
     return {
-        'first_name': first_name,
-        'last_name': last_name,
-        'middle_initial': middle_initial
+        'first_name': f'{first}{suffix}' if first else None,
+        'last_name': f'{last}{suffix}' if last else None,
+        'middle_initial': f'{middle}{suffix}' if middle else None,
     }
diff --git a/legal-api/tests/unit/services/test_digital_credentials.py b/legal-api/tests/unit/services/test_digital_credentials.py
index 82fd74eb71..263a5e2a64 100644
--- a/legal-api/tests/unit/services/test_digital_credentials.py
+++ b/legal-api/tests/unit/services/test_digital_credentials.py
@@ -11,9 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for the Minio service.
+"""Tests for the Digital Credentials service.
 
-Test suite to ensure that the Digital Credentials service are working as expected.
+Test suite to ensure that the Digital Credentials service is working as expected.
 """
 from unittest.mock import MagicMock