test: updating tests and some code refactor

[paulushcgcj]

Description

Code refactor and test update

Checklist

• I have read the CONTRIBUTING doc
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have already been accepted and merged

Further comments

---

Thanks for the PR!

Any successful deployments (not always required) will be available below.

Backend: https://nr-silva-428-backend.apps.silver.devops.gov.bc.ca/actuator/health
Frontend: https://nr-silva-28-frontend.apps.silver.devops.gov.bc.ca

Once merged, code will be promoted and handed off to following workflow run.
Main Merge Workflow

[DerekRoberts]

Great! My favourite tests are the ones that keep working. :D