diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f5c45b..454f858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [3.1.0] - 2020-05-21
+
+### Added
+
+* Server preserves query params in prerender proxy pass.
+
+### Changed
+
+None.
+
+### Removed
+
+None.
+
 ## [3.0.0] - 2020-05-15
 
 ### Added
diff --git a/Dockerfile b/Dockerfile
index ab83115..852e20d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM composer:1.10
+FROM roquie/composer-parallel:1
 
 COPY . /app
 
diff --git a/Dockerfile.test b/Dockerfile.test
index c28e635..45702d1 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM roquie/composer-parallel
+FROM roquie/composer-parallel:1
 
 COPY . /app
 
diff --git a/Makefile b/Makefile
index 96d3232..381d060 100644
--- a/Makefile
+++ b/Makefile
@@ -11,3 +11,7 @@ push:
 
 run:
 	docker run --rm -it --init -p 8088:8080 $(IMAGE):$(VERSION)
+
+test:
+	docker run -w /app --entrypoint bash --rm -it --init -v `pwd`/:/app \
+		spacetabio/static-server-php:3.1.0-xdebug -c "vendor/bin/phpunit"
diff --git a/composer.json b/composer.json
index c62722a..21f1d62 100644
--- a/composer.json
+++ b/composer.json
@@ -38,5 +38,11 @@
     "psr-4": {
       "StaticServer\\Tests\\": "tests"
     }
+  },
+  "scripts": {
+    "test": [
+      "phpstan analyse src --level 6",
+      "phpunit"
+    ]
   }
 }
diff --git a/composer.lock b/composer.lock
index eeec57d..0d7e4b6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4317,12 +4317,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "9b0501ceb2d00bea5814316c5333d513d7622ed5"
+                "reference": "885e8b1e0bc2096989fd20938342e407e8045186"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/9b0501ceb2d00bea5814316c5333d513d7622ed5",
-                "reference": "9b0501ceb2d00bea5814316c5333d513d7622ed5",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/885e8b1e0bc2096989fd20938342e407e8045186",
+                "reference": "885e8b1e0bc2096989fd20938342e407e8045186",
                 "shasum": ""
             },
             "conflict": {
@@ -4335,7 +4335,8 @@
                 "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99",
                 "aws/aws-sdk-php": ">=3,<3.2.1",
                 "bagisto/bagisto": "<0.1.5",
-                "barrelstrength/sprout-base-email": "<3.9",
+                "barrelstrength/sprout-base-email": "<1.2.7",
+                "barrelstrength/sprout-forms": "<3.9",
                 "bolt/bolt": "<3.6.10",
                 "brightlocal/phpwhois": "<=4.2.5",
                 "buddypress/buddypress": "<5.1.2",
@@ -4588,7 +4589,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-14T00:01:29+00:00"
+            "time": "2020-05-16T00:00:31+00:00"
         },
         {
             "name": "roave/signature",