diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c7d212b..f7f86f3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,8 +13,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        with:
-            ref: main
       - name: Add environment variables to .env
         run: |
           echo "DATABASE_URL=postgresql+asyncpg://postgres:postgres@db:5432/starter_db_dev" >> .env
diff --git a/Dockerfile b/Dockerfile
index ef5c00f..9aab59a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.11-slim
 
 WORKDIR /usr/src/app
 ENV PYTHONDONTWRITEBYTECODE 1
diff --git a/Dockerfile.test b/Dockerfile.test
index 583e284..e9ca71a 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,5 +1,5 @@
 # pull official base image
-FROM python:3.10-slim
+FROM python:3.11-slim
 
 # set work directory
 WORKDIR /usr/src/app
diff --git a/Makefile b/Makefile
index 0fef8c7..6ba9cef 100644
--- a/Makefile
+++ b/Makefile
@@ -27,3 +27,7 @@ rebuild:
 rebuild-d:
 	docker-compose down -v --remove-orphans && sudo rm -rf postgres-data;
 	docker-compose up --build -d;
+
+d-test:
+	# Rebuilds container and runs docker test
+	docker-compose build web-test && docker-compose run web-test pytest tests -x -o log_cli=true
diff --git a/README.md b/README.md
index 5dfa6c8..af8aff5 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,36 @@
 # starter-api
+
 ![Continuous Integration](https://github.com/jonwhittlestone/starter-api/workflows/Continuous%20Integration/badge.svg)
 
 ## Usage
+
 ```bash
 make up-build
 ```
 
-Run the command above and then visit: http://127.0.0.1:8004 
+Run the command above and then visit: http://127.0.0.1:8004
 
+### Run the tests:
 
-> See [snippets-resources.md](snippets-resources.md) for handy snippets and resources.
+```bash
+make d-test
+```
 
+> See [snippets-resources.md](snippets-resources.md) for handy snippets and resources.
 
 ## Debug FastAPI using VSCode
 
 1. Run this:
-    ```bash
-    make up-build
-    ```
+
+   ```bash
+   make up-build
+   ```
 
 2. In vscode add a breakpoint
 
 3. Run the debugger (F5)
 
-4. Visit: http://127.0.0.1:8004 
+4. Visit: http://127.0.0.1:8004
 
 5. The vscode debugger will pause execution at your breakpoint.
 
@@ -35,13 +42,13 @@ Run the command above and then visit: http://127.0.0.1:8004
 - [x] Poetry, Dynaconf
 - [x] Containerised tests
 - [x] Github Action to run tests
-- [ ] FastAPI repositories, schemas / logging / cleanup and mocked tests
+- [ ] FastAPI config, routers, user model, auth, repositories, schemas, logging, cleanup and mocked tests.
 - [ ] Production deployment
 - [ ] Pre-commit / manage.py / migrations
 - [ ] Tag this repo and release
 ```
 
-<!-- 
+<!--
 ```
 - [ ] Simple React Typescript Frontend
 - [ ] Okta auth
diff --git a/backend/api/__init__.py b/backend/api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backend/api/album.py b/backend/api/album.py
new file mode 100644
index 0000000..7cf06f6
--- /dev/null
+++ b/backend/api/album.py
@@ -0,0 +1,28 @@
+from fastapi import APIRouter, Depends, status
+
+
+from sqlalchemy.future import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from ..models import Album, AlbumCreate
+from ..db import init_db, get_session
+
+routers = APIRouter()
+
+@routers.get("/albums", response_model=list[Album])
+async def get_songs(session: AsyncSession = Depends(get_session)):
+    result = await session.execute(select(Album))
+    albums = result.scalars().all()
+    return [
+            Album(name=album.name, artist=album.artist, year=album.year, id=album.id) 
+            for album in albums
+    ]
+
+
+@routers.post("/albums", status_code=status.HTTP_201_CREATED, response_model=Album)
+async def add_album(album: AlbumCreate, session: AsyncSession = Depends(get_session)):
+    album = Album(name=album.name, artist=album.artist, year=album.year)
+    session.add(album)
+    await session.commit()
+    await session.refresh(album)
+    return album
\ No newline at end of file
diff --git a/backend/api/endpoints.py b/backend/api/endpoints.py
new file mode 100644
index 0000000..7334d3c
--- /dev/null
+++ b/backend/api/endpoints.py
@@ -0,0 +1,9 @@
+
+from fastapi import APIRouter
+
+from .health import routers as health_router
+from .album import routers as album_router
+
+routers = APIRouter()
+routers.include_router(health_router, tags=["health"])
+routers.include_router(album_router, tags=["album"])
\ No newline at end of file
diff --git a/backend/api/health.py b/backend/api/health.py
new file mode 100644
index 0000000..f3d65b8
--- /dev/null
+++ b/backend/api/health.py
@@ -0,0 +1,19 @@
+
+
+from fastapi import APIRouter, status
+from fastapi.responses import Response, JSONResponse
+from ..config.dyna import settings
+
+routers = APIRouter()
+
+
+@routers.get(
+    "/health",
+    response_model=str,
+    description="health check",
+    name="health",
+)
+async def health() -> JSONResponse:
+    return JSONResponse(content={"current_env": settings.current_env}, 
+                    status_code=status.HTTP_200_OK
+    )
diff --git a/backend/config/__init__.py b/backend/config/__init__.py
new file mode 100644
index 0000000..68cd5b5
--- /dev/null
+++ b/backend/config/__init__.py
@@ -0,0 +1,25 @@
+
+import os
+from pydantic import BaseSettings
+
+from .dyna import settings
+
+
+class CoreSettings(BaseSettings):
+    DEBUG: bool = False
+    SERVICE_NAME: str = "starter-api"
+    SERVICE_LABEL: str = f"starter-api {settings.current_env}"
+    SERVICE_VERSION = "1.0.0"
+    SERVICE_DESCRIPTION = "A no-brainer starter for a dockerised FastAPI app"
+    DATABASE_URL: str = os.environ.get("DATABASE_URL", "")
+    APP_HOST: str = "0.0.0.0"  # nosec
+    APP_PORT: int = 8000
+
+class ModuleSettings(BaseSettings):
+    ...
+
+class Sett(CoreSettings, ModuleSettings):
+    pass
+
+
+setts = Sett()
\ No newline at end of file
diff --git a/backend/config/settings.toml b/backend/config/settings.toml
index c0a4b09..334ff0f 100644
--- a/backend/config/settings.toml
+++ b/backend/config/settings.toml
@@ -1,17 +1,17 @@
 [default]
-APP_NAME="Starter API"
-
+APP_LABEL="Starter API"
+ 
 [development]
-APP_NAME="Starter API DEV"
+APP_LABEL="Starter API DEV"
 
 [ci]
-APP_NAME="Starter API CI"
+APP_LABEL="Starter API CI"
 
 [testing]
-APP_NAME="Starter API TEST"
+APP_LABEL="Starter API TEST"
 
 [staging]
-APP_NAME="Starter API ST"
+APP_LABEL="Starter API ST"
 
 [production]
-APP_NAME="Starter API PR"
\ No newline at end of file
+APP_LABEL="Starter API PR"
\ No newline at end of file
diff --git a/backend/db.py b/backend/db.py
index 48f9665..dc0af2c 100644
--- a/backend/db.py
+++ b/backend/db.py
@@ -5,10 +5,10 @@
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
 from sqlalchemy.orm import sessionmaker
 
+from .config import setts
 
-DATABASE_URL = os.environ.get("DATABASE_URL")
 
-engine = create_async_engine(DATABASE_URL, echo=True, future=True)
+engine = create_async_engine(setts.DATABASE_URL, echo=True, future=True)
 
 
 async def init_db():
diff --git a/backend/main.py b/backend/main.py
index 342e303..fdf5ffb 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -1,37 +1,28 @@
-import uvicorn
-
 from fastapi import Body, FastAPI, Depends, Request
-from starlette.status import HTTP_201_CREATED
-from .db import init_db, get_session
-from .models import Album, AlbumCreate
-from .config.dyna import settings
-
-from sqlalchemy.future import select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from fastapi.responses import JSONResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 
+from .db import init_db
+from .config import setts
+from .api.endpoints import routers
+
+
+app = FastAPI(
+    title=setts.SERVICE_LABEL,
+    description=setts.SERVICE_DESCRIPTION,
+    version=setts.SERVICE_VERSION,
+    debug=setts.DEBUG,
+)
 
-app = FastAPI(title=settings.APP_NAME,)
 app.mount("/static", StaticFiles(directory="backend/static"), name="static")
 templates = Jinja2Templates(directory="backend/templates")
 
+
 @app.on_event("startup")
 async def on_startup():
     await init_db()
 
 
-@app.get("/health")
-def health():
-    return JSONResponse(status_code=200, 
-                        content={
-                            "app_name": settings.APP_NAME,
-                            "current_env": settings.current_env,
-                        })
-
-
 @app.get("/")
 def home(request: Request):
     # add a breakpoint on line below
@@ -42,25 +33,9 @@ def home(request: Request):
         "step-two": "In vscode add a breakpoint",
         "step-three": "Run the debugger (F5)",
         "step-four": "Open the browser to http://127.0.0.1:8004",
-        "step-five": "It will pause execution at the breakpoint"
+        "step-five": "It will pause execution at the breakpoint",
     }
-    #return templates.TemplateResponse("home.html", context={"request": request})
-
-@app.get("/albums", response_model=list[Album])
-async def get_songs(session: AsyncSession = Depends(get_session)):
-    result = await session.execute(select(Album))
-    albums = result.scalars().all()
-    return [
-            Album(name=album.name, artist=album.artist, year=album.year, id=album.id) 
-            for album in albums
-    ]
-
 
-@app.post("/albums", status_code=HTTP_201_CREATED, response_model=Album)
-async def add_album(album: AlbumCreate, session: AsyncSession = Depends(get_session)):
-    album = Album(name=album.name, artist=album.artist, year=album.year)
-    session.add(album)
-    await session.commit()
-    await session.refresh(album)
-    return album
 
+# register routes
+app.include_router(routers, prefix="/api/v1")
diff --git a/backend/poetry.lock b/backend/poetry.lock
index 0a84a5f..acd50a6 100644
--- a/backend/poetry.lock
+++ b/backend/poetry.lock
@@ -105,6 +105,25 @@ dev = ["Cython (>=0.29.24,<0.30.0)", "Sphinx (>=4.1.2,<4.2.0)", "flake8 (>=5.0.4
 docs = ["Sphinx (>=4.1.2,<4.2.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)"]
 test = ["flake8 (>=5.0.4,<5.1.0)", "uvloop (>=0.15.3)"]
 
+[[package]]
+name = "attrs"
+version = "23.1.0"
+description = "Classes Without Boilerplate"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"},
+    {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"},
+]
+
+[package.extras]
+cov = ["attrs[tests]", "coverage[toml] (>=5.3)"]
+dev = ["attrs[docs,tests]", "pre-commit"]
+docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"]
+tests = ["attrs[tests-no-zope]", "zope-interface"]
+tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+
 [[package]]
 name = "certifi"
 version = "2023.5.7"
@@ -117,6 +136,83 @@ files = [
     {file = "certifi-2023.5.7.tar.gz", hash = "sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7"},
 ]
 
+[[package]]
+name = "cffi"
+version = "1.15.1"
+description = "Foreign Function Interface for Python calling C code."
+category = "main"
+optional = false
+python-versions = "*"
+files = [
+    {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"},
+    {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"},
+    {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"},
+    {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"},
+    {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"},
+    {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"},
+    {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"},
+    {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"},
+    {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"},
+    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"},
+    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"},
+    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"},
+    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"},
+    {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"},
+    {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"},
+    {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"},
+    {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"},
+    {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"},
+    {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"},
+    {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"},
+    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"},
+    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"},
+    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"},
+    {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"},
+    {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"},
+    {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"},
+    {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"},
+    {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"},
+    {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"},
+    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"},
+    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"},
+    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"},
+    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"},
+    {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"},
+    {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"},
+    {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"},
+    {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"},
+    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"},
+    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"},
+    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"},
+    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"},
+    {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"},
+    {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"},
+    {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"},
+    {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"},
+    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"},
+    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"},
+    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"},
+    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"},
+    {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"},
+    {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"},
+    {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"},
+    {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"},
+    {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"},
+    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"},
+    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"},
+    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"},
+    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"},
+    {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"},
+    {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"},
+    {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"},
+    {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"},
+    {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"},
+    {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"},
+]
+
+[package.dependencies]
+pycparser = "*"
+
 [[package]]
 name = "charset-normalizer"
 version = "3.1.0"
@@ -233,7 +329,7 @@ files = [
 name = "debugpy"
 version = "1.6.7"
 description = "An implementation of the Debug Adapter Protocol for Python"
-category = "main"
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -403,7 +499,7 @@ files = [
 name = "httpcore"
 version = "0.17.2"
 description = "A minimal low-level HTTP client."
-category = "main"
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -425,7 +521,7 @@ socks = ["socksio (>=1.0.0,<2.0.0)"]
 name = "httpx"
 version = "0.24.1"
 description = "The next generation HTTP client."
-category = "main"
+category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
@@ -567,6 +663,21 @@ files = [
     {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"},
 ]
 
+[[package]]
+name = "outcome"
+version = "1.2.0"
+description = "Capture the outcome of Python function calls."
+category = "main"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "outcome-1.2.0-py2.py3-none-any.whl", hash = "sha256:c4ab89a56575d6d38a05aa16daeaa333109c1f96167aba8901ab18b6b5e0f7f5"},
+    {file = "outcome-1.2.0.tar.gz", hash = "sha256:6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672"},
+]
+
+[package.dependencies]
+attrs = ">=19.2.0"
+
 [[package]]
 name = "packaging"
 version = "23.1"
@@ -667,6 +778,18 @@ files = [
     {file = "psycopg2_binary-2.9.6-cp39-cp39-win_amd64.whl", hash = "sha256:f6a88f384335bb27812293fdb11ac6aee2ca3f51d3c7820fe03de0a304ab6249"},
 ]
 
+[[package]]
+name = "pycparser"
+version = "2.21"
+description = "C parser in Python"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+files = [
+    {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
+    {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
+]
+
 [[package]]
 name = "pydantic"
 version = "1.10.9"
@@ -743,6 +866,23 @@ tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""}
 [package.extras]
 testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"]
 
+[[package]]
+name = "pytest-trio"
+version = "0.8.0"
+description = "Pytest plugin for trio"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pytest-trio-0.8.0.tar.gz", hash = "sha256:8363db6336a79e6c53375a2123a41ddbeccc4aa93f93788651641789a56fb52e"},
+    {file = "pytest_trio-0.8.0-py3-none-any.whl", hash = "sha256:e6a7e7351ae3e8ec3f4564d30ee77d1ec66e1df611226e5618dbb32f9545c841"},
+]
+
+[package.dependencies]
+outcome = ">=1.1.0"
+pytest = ">=7.2.0"
+trio = ">=0.22.0"
+
 [[package]]
 name = "requests"
 version = "2.31.0"
@@ -777,6 +917,18 @@ files = [
     {file = "sniffio-1.3.0.tar.gz", hash = "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101"},
 ]
 
+[[package]]
+name = "sortedcontainers"
+version = "2.4.0"
+description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set"
+category = "main"
+optional = false
+python-versions = "*"
+files = [
+    {file = "sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"},
+    {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"},
+]
+
 [[package]]
 name = "sqlalchemy"
 version = "1.4.41"
@@ -914,6 +1066,27 @@ files = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 
+[[package]]
+name = "trio"
+version = "0.22.2"
+description = "A friendly Python library for async concurrency and I/O"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "trio-0.22.2-py3-none-any.whl", hash = "sha256:f43da357620e5872b3d940a2e3589aa251fd3f881b65a608d742e00809b1ec38"},
+    {file = "trio-0.22.2.tar.gz", hash = "sha256:3887cf18c8bcc894433420305468388dac76932e9668afa1c49aa3806b6accb3"},
+]
+
+[package.dependencies]
+attrs = ">=20.1.0"
+cffi = {version = ">=1.14", markers = "os_name == \"nt\" and implementation_name != \"pypy\""}
+exceptiongroup = {version = ">=1.0.0rc9", markers = "python_version < \"3.11\""}
+idna = "*"
+outcome = "*"
+sniffio = "*"
+sortedcontainers = "*"
+
 [[package]]
 name = "typing-extensions"
 version = "4.6.3"
@@ -966,4 +1139,4 @@ standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)",
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "5ead9a31c7d2e019e936684edc3dab3f67efb475be487c5a6d62e2691aef928e"
+content-hash = "c038a0f3490e4b9113b36edb0dca8f4c458a70381f11510fbd59fbb1148c2173"
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index d627214..2e2bd36 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -17,6 +17,8 @@ requests = "^2.28.2"
 sqlmodel = "^0.0.8"
 uvicorn = "^0.22.0"
 dynaconf = "^3.1.12"
+trio = "^0.22.2"
+pytest-trio = "^0.8.0"
 
 
 [tool.poetry.dev-dependencies]
@@ -26,7 +28,7 @@ dynaconf = "^3.1.12"
 # dev
 httpx = "^0.24.1"
 debugpy = "^1.6.7"
-pytest = "^7.2.2"
+pytest = "^7.4.0"
 
 
 [build-system]
diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py
index de025d8..83bd693 100644
--- a/backend/tests/conftest.py
+++ b/backend/tests/conftest.py
@@ -1,10 +1,24 @@
 import pytest
-from starlette.testclient import TestClient
 
-from ..main import app
+from fastapi.testclient import TestClient
+from sqlmodel import Session, SQLModel, create_engine
+from sqlmodel.pool import StaticPool
 
 
-@pytest.fixture(scope="module")
-def test_app():
-    client = TestClient(app)
-    yield client  # testing happens here
+@pytest.fixture(name="session")
+def session_fixture():
+    # in memory db
+    engine = create_engine(
+        "sqlite://",  #
+        connect_args={"check_same_thread": False},
+        poolclass=StaticPool,  #
+    )
+    SQLModel.metadata.create_all(engine)
+    with Session(engine) as session:
+        yield session
+
+
+@pytest.fixture(name="client")  #
+def client_fixture(session: Session):  #
+    def get_session_override():  #
+        return session
diff --git a/backend/tests/test_albums.py b/backend/tests/test_albums.py
index ae30e8f..55ea80e 100644
--- a/backend/tests/test_albums.py
+++ b/backend/tests/test_albums.py
@@ -1,11 +1,23 @@
-from starlette.testclient import TestClient
+import pytest
+from fastapi.testclient import TestClient
+from httpx import AsyncClient
 
 from ..main import app
 
-client = TestClient(app)
 
-
-def test_health():
-    response = client.get("/health")
-    print(response)
+@pytest.mark.anyio
+async def test_root():
+    async with AsyncClient(app=app, base_url="http://test") as ac:
+        response = await ac.get("/")
     assert response.status_code == 200
+
+
+def test_create_album(client: TestClient):
+    client = TestClient(app)  #
+    test_data = {"name": "Blood Sugar Sex Magik", "artist": "RHCP", "year": "1991"}
+    response = client.post("/api/v1/albums", json=test_data)
+    data = response.json()
+    assert response.status_code == 201
+
+    assert data["name"] == test_data.get("name")
+    assert data["artist"] == test_data.get("artist")
diff --git a/requirements.txt b/requirements.txt
index f7baab1..5cdd6a6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,10 +6,14 @@ dynaconf==3.1.12
 fastapi==0.97.0
 psycopg2-binary==2.9.6
 requests==2.28.2
+
 sqlmodel==0.0.8
 uvicorn==0.22.0
 
 # dev
 httpx==0.24.1
 debugpy==1.6.7
-pytest==7.2.2
\ No newline at end of file
+pytest==7.4.0
+asgi-lifespan==2.1.0
+trio==0.22.2
+pytest-trio ==0.8.0
\ No newline at end of file
diff --git a/snippets-resources.md b/snippets-resources.md
index aaaed21..b600ca1 100644
--- a/snippets-resources.md
+++ b/snippets-resources.md
@@ -11,7 +11,14 @@ Warning: The `make rebuild-d` command will remove your postgres volume.
 
 ```bash
 make rebuild-d; \
-docker-compose exec web-test tests -x -o log_cli=true
+docker-compose run web-test pytest tests -x -o log_cli=true
+```
+
+### Docker Test workflow
+
+```bash
+docker-compose build web-test && docker-compose run web-test pytest tests -x -o log_cli=true
+
 ```
 
 ### Check DB Provisioning