diff --git a/TODO.md b/TODO.md
index e83d88f9fa..b5ad3ca12b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,11 @@
 Tasks for `0.9.10`:
 - [x] `build.publicPath` #25
-- [ ] Use [name].[chunkhash].js for generated js (production) #218
-- [ ] Add expired headers (production)
+- [x] Use [name].[chunkhash].js for generated js (production) #218
+- [x] Add expired headers (production)
 - [x] Activate layout only on afterEach #214
-- [ ] Custom layout in layouts/error.vue #172
+- [x] Custom layout in layouts/error.vue #172
+- [ ] Test + Coverage performance, cache, filenames
+- [ ] Manual tests on router.base & publicPath
+- [ ] Add Doc for build.filenames, performance.gzip and performance.prefetch
 
 -> Not possible to have custom layout for a page, it should do the condition inside the layout itself (because of the middleware strategy)
diff --git a/test/fixtures/basic/nuxt.config.js b/test/fixtures/basic/nuxt.config.js
index 1793846e1f..13d5d0cef5 100644
--- a/test/fixtures/basic/nuxt.config.js
+++ b/test/fixtures/basic/nuxt.config.js
@@ -1,7 +1,7 @@
 module.exports = {
   generate: {
     routeParams: {
-      '/users/:id': [
+      '/users/:id?': [
         { id: 1 },
         { id: 2 },
         { id: 3 }
diff --git a/test/with-config.test.js b/test/with-config.test.js
index d79c91450a..5f16a6ac66 100644
--- a/test/with-config.test.js
+++ b/test/with-config.test.js
@@ -62,7 +62,7 @@ test('/test/about-bis (added with extendRoutes)', async t => {
 
 test('Check stats.json generated by build.analyze', t => {
   const stats = require(resolve(__dirname, 'fixtures/with-config/.nuxt/dist/stats.json'))
-  t.is(stats.assets.length, 11)
+  t.is(stats.assets.length, 12)
 })
 
 // Close server and ask nuxt to stop listening to file changes