diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c9cd054..9a11d2d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ env.PHP_VERSION }}
-          extensions: bcmath
           tools: composer:2
 
       - name: Validate composer.json
@@ -52,7 +51,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ env.PHP_VERSION }}
-          extensions: bcmath
           tools: composer:2
 
       - name: Download vendor artifact from build
@@ -77,7 +75,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ env.PHP_VERSION }}
-          extensions: bcmath
           tools: composer:2
 
       - name: Download vendor artifact from build
diff --git a/Makefile b/Makefile
index 301b315..c87ae0a 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,10 @@ test-file: ## Run tests for a specific file (usage: make test-file FILE=path/to/
 test-no-coverage: configure-test-environment ## Run all tests without coverage
 	@${DOCKER_RUN} composer tests-no-coverage
 
+.PHONY: unit-test-no-coverage
+unit-test-no-coverage: ## Run unit tests without coverage
+	@${DOCKER_RUN} composer run unit-tests-no-coverage
+
 .PHONY: configure-test-environment
 configure-test-environment:
 	@if ! docker network inspect tiny-blocks > /dev/null 2>&1; then \
@@ -63,7 +67,7 @@ help:  ## Display this help message
 		| awk 'BEGIN {FS = ":.*? ## "}; {printf "$(YELLOW)%-25s$(RESET) %s\n", $$1, $$2}'
 	@echo ""
 	@echo "$$(printf '$(GREEN)')Testing$$(printf '$(RESET)')"
-	@grep -E '^(test|test-file|test-no-coverage):.*?## .*$$' $(MAKEFILE_LIST) \
+	@grep -E '^(test|test-file|test-no-coverage|unit-test-no-coverage):.*?## .*$$' $(MAKEFILE_LIST) \
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "$(YELLOW)%-25s$(RESET) %s\n", $$1, $$2}'
 	@echo ""
 	@echo "$$(printf '$(GREEN)')Quality$$(printf '$(RESET)')"
diff --git a/composer.json b/composer.json
index 847a41d..eba884d 100644
--- a/composer.json
+++ b/composer.json
@@ -41,16 +41,16 @@
     "require": {
         "php": "^8.5",
         "symfony/process": "^7.4",
-        "tiny-blocks/ksuid": "^1.4",
-        "tiny-blocks/mapper": "1.2.*",
-        "tiny-blocks/collection": "1.12.*"
+        "tiny-blocks/ksuid": "^1.5",
+        "tiny-blocks/mapper": "^2.0",
+        "tiny-blocks/collection": "^1.15"
     },
     "require-dev": {
         "ext-pdo": "*",
         "phpunit/phpunit": "^11.5",
         "phpstan/phpstan": "^2.1",
         "dg/bypass-finals": "^1.9",
-        "squizlabs/php_codesniffer": "^3.13"
+        "squizlabs/php_codesniffer": "^4.0"
     },
     "scripts": {
         "test": "php -d memory_limit=2G ./vendor/bin/phpunit --configuration phpunit.xml tests",
@@ -58,6 +58,7 @@
         "phpstan": "php ./vendor/bin/phpstan analyse -c phpstan.neon.dist --quiet --no-progress",
         "test-file": "php ./vendor/bin/phpunit --configuration phpunit.xml --no-coverage --filter",
         "test-no-coverage": "php ./vendor/bin/phpunit --configuration phpunit.xml --no-coverage tests",
+        "unit-tests-no-coverage": "php ./vendor/bin/phpunit --configuration phpunit.xml --no-coverage --testsuite unit",
         "review": [
             "@phpcs",
             "@phpstan"