diff --git a/e2e_test.ts b/e2e_test.ts
index 848982d6349e..f8143d33d435 100644
--- a/e2e_test.ts
+++ b/e2e_test.ts
@@ -44,291 +44,289 @@ function assertResponseJson(resp: Response) {
   assertEquals(resp.headers.get("content-type"), "application/json");
 }
 
-Deno.test("[e2e]", async (test) => {
-  await test.step("GET /", async () => {
-    const resp = await handler(new Request("http://localhost"));
-
-    assert(resp.ok);
-    assertInstanceOf(resp.body, ReadableStream);
-    assertEquals(
-      resp.headers.get("content-type"),
-      "text/html; charset=utf-8",
-    );
-    assertEquals(resp.status, 200);
-  });
-
-  await test.step("GET /account", async () => {
-    const resp = await handler(
-      new Request("http://localhost/account"),
-    );
-
-    assertFalse(resp.ok);
-    assertFalse(resp.body);
-    assertEquals(resp.headers.get("location"), "/signin");
-    assertEquals(resp.status, 303);
-  });
-
-  await test.step("GET /callback", async () => {
-    const resp = await handler(
-      new Request("http://localhost/callback"),
-    );
-
-    assertFalse(resp.ok);
-    assertInstanceOf(resp.body, ReadableStream);
-    assertEquals(
-      resp.headers.get("content-type"),
-      "text/html; charset=utf-8",
-    );
-    assertEquals(resp.status, 500);
-  });
-
-  await test.step("GET /blog", async () => {
-    const resp = await handler(
-      new Request("http://localhost/blog"),
-    );
-
-    assert(resp.ok);
-    assertInstanceOf(resp.body, ReadableStream);
-    assertEquals(
-      resp.headers.get("content-type"),
-      "text/html; charset=utf-8",
-    );
-    assertEquals(resp.status, 200);
-  });
-
-  await test.step("GET /pricing", async () => {
-    const resp = await handler(
-      new Request("http://localhost/pricing"),
-    );
-
-    assertFalse(resp.ok);
-    assertInstanceOf(resp.body, ReadableStream);
-    assertEquals(
-      resp.headers.get("content-type"),
-      "text/html; charset=utf-8",
-    );
-    assertEquals(resp.status, 404);
-  });
-
-  await test.step("GET /signin", async () => {
-    const resp = await handler(
-      new Request("http://localhost/signin"),
-    );
-
-    assertFalse(resp.ok);
-    assertFalse(resp.body);
-    assertStringIncludes(
-      resp.headers.get("location")!,
-      "https://github.com/login/oauth/authorize",
-    );
-    assertEquals(resp.status, 302);
-  });
-
-  await test.step("GET /signout", async () => {
-    const resp = await handler(
-      new Request("http://localhost/signout"),
-    );
-
-    assertFalse(resp.ok);
-    assertFalse(resp.body);
-    assertEquals(resp.headers.get("location"), "/");
-    assertEquals(resp.status, 302);
-  });
-
-  await test.step("GET /dashboard", async () => {
-    const resp = await handler(
-      new Request("http://localhost/dashboard"),
-    );
-
-    assertFalse(resp.ok);
-    assertFalse(resp.body);
-    assertEquals(resp.headers.get("location"), "/signin");
-    assertEquals(resp.status, 303);
-  });
-
-  await test.step("GET /dashboard/stats", async () => {
-    const resp = await handler(
-      new Request("http://localhost/dashboard/stats"),
-    );
-
-    assertFalse(resp.ok);
-    assertFalse(resp.body);
-    assertEquals(resp.headers.get("location"), "/signin");
-    assertEquals(resp.status, 303);
-  });
-
-  await test.step("GET /dashboard/users", async () => {
-    const resp = await handler(
-      new Request("http://localhost/dashboard/users"),
-    );
-
-    assertFalse(resp.ok);
-    assertFalse(resp.body);
-    assertEquals(resp.headers.get("location"), "/signin");
-    assertEquals(resp.status, 303);
-  });
-
-  await test.step("GET /submit", async () => {
-    const resp = await handler(
-      new Request("http://localhost/submit"),
-    );
-
-    assertFalse(resp.ok);
-    assertFalse(resp.body);
-    assertEquals(resp.headers.get("location"), "/signin");
-    assertEquals(resp.status, 303);
-  });
-
-  await test.step("GET /feed", async () => {
-    const resp = await handler(
-      new Request("http://localhost/feed"),
-    );
-
-    assert(resp.ok);
-    assertInstanceOf(resp.body, ReadableStream);
-    assertEquals(
-      resp.headers.get("content-type"),
-      "application/atom+xml; charset=utf-8",
-    );
-    assertEquals(resp.status, 200);
-  });
-
-  await test.step("GET /api/items", async () => {
-    const item1 = genNewItem();
-    const item2 = genNewItem();
-    await createItem(item1);
-    await createItem(item2);
-
-    const req = new Request("http://localhost/api/items");
-    const resp = await handler(req);
-
-    const { values } = await resp.json();
-    assertResponseJson(resp);
-    assertArrayIncludes(values, [
-      JSON.parse(JSON.stringify(item1)),
-      JSON.parse(JSON.stringify(item2)),
-    ]);
-  });
-
-  await test.step("GET /api/items/[id]", async () => {
-    const item = genNewItem();
-    const req = new Request("http://localhost/api/items/" + item.id);
-
-    const resp1 = await handler(req);
-    assertFalse(resp1.ok);
-    assertEquals(await resp1.text(), "Item not found");
-    assertEquals(resp1.status, Status.NotFound);
-
-    await createItem(item);
-    const resp2 = await handler(req);
-    assertResponseJson(resp2);
-    assertEquals(await resp2.json(), JSON.parse(JSON.stringify(item)));
-  });
-
-  await test.step("GET /api/items/[id]/comments", async () => {
-    const item = genNewItem();
-    const comment: Comment = {
-      ...genNewComment(),
-      itemId: item.id,
-    };
-    const req = new Request(`http://localhost/api/items/${item.id}/comments`);
-
-    const resp1 = await handler(req);
-    assertFalse(resp1.ok);
-    assertEquals(await resp1.text(), "Item not found");
-    assertEquals(resp1.status, Status.NotFound);
-
-    await createItem(item);
-    await createComment(comment);
-    const resp2 = await handler(req);
-    const { values } = await resp2.json();
-    assertResponseJson(resp2);
-    assertEquals(values, [JSON.parse(JSON.stringify(comment))]);
-  });
-
-  await test.step("POST /api/items", async () => {
-    const resp = await handler(
-      new Request("http://localhost/api/items", { method: "POST" }),
-    );
-
-    assertFalse(resp.ok);
-    assertEquals(await resp.text(), "User must be signed in");
-    assertEquals(resp.status, Status.Unauthorized);
-  });
-
-  await test.step("GET /api/users", async () => {
-    const user1 = genNewUser();
-    const user2 = genNewUser();
-    await createUser(user1);
-    await createUser(user2);
-
-    const req = new Request("http://localhost/api/users");
-    const resp = await handler(req);
-
-    const { values } = await resp.json();
-    assertResponseJson(resp);
-    assertArrayIncludes(values, [user1, user2]);
-  });
-
-  await test.step("GET /api/users/[login]", async () => {
-    const user = genNewUser();
-    const req = new Request("http://localhost/api/users/" + user.login);
-
-    const resp1 = await handler(req);
-    assertFalse(resp1.ok);
-    assertEquals(await resp1.text(), "User not found");
-    assertEquals(resp1.status, Status.NotFound);
-
-    await createUser(user);
-    const resp2 = await handler(req);
-    assertResponseJson(resp2);
-    assertEquals(await resp2.json(), user);
-  });
-
-  await test.step("GET /api/users/[login]/items", async () => {
-    const user = genNewUser();
-    const item: Item = {
-      ...genNewItem(),
-      userLogin: user.login,
-    };
-    const req = new Request(`http://localhost/api/users/${user.login}/items`);
-
-    const resp1 = await handler(req);
-    assertResponseNotFound(resp1);
-
-    await createUser(user);
-    await createItem(item);
-
-    const resp2 = await handler(req);
-    const { values } = await resp2.json();
-    assertResponseJson(resp2);
-    assertArrayIncludes(values, [JSON.parse(JSON.stringify(item))]);
-  });
-
-  await test.step("GET /api/users/[login]/notifications", async () => {
-    const user = genNewUser();
-    const notification: Notification = {
-      ...genNewNotification(),
-      userLogin: user.login,
-    };
-    const url = "http://localhost/api/me/notifications";
-
-    const resp1 = await handler(new Request(url));
-    assertFalse(resp1.ok);
-    assertEquals(resp1.status, Status.Unauthorized);
-
-    await createUser(user);
-    await createNotification(notification);
-
-    const resp2 = await handler(
-      new Request(url, {
-        headers: { cookie: "site-session=" + user.sessionId },
-      }),
-    );
-    const { values } = await resp2.json();
-    assertResponseJson(resp2);
-    assertArrayIncludes(values, [
-      JSON.parse(JSON.stringify(notification)),
-    ]);
-  });
+Deno.test("[e2e] GET /", async () => {
+  const resp = await handler(new Request("http://localhost"));
+
+  assert(resp.ok);
+  assertInstanceOf(resp.body, ReadableStream);
+  assertEquals(
+    resp.headers.get("content-type"),
+    "text/html; charset=utf-8",
+  );
+  assertEquals(resp.status, 200);
+});
+
+Deno.test("[e2e] GET /account", async () => {
+  const resp = await handler(
+    new Request("http://localhost/account"),
+  );
+
+  assertFalse(resp.ok);
+  assertFalse(resp.body);
+  assertEquals(resp.headers.get("location"), "/signin");
+  assertEquals(resp.status, 303);
+});
+
+Deno.test("[e2e] GET /callback", async () => {
+  const resp = await handler(
+    new Request("http://localhost/callback"),
+  );
+
+  assertFalse(resp.ok);
+  assertInstanceOf(resp.body, ReadableStream);
+  assertEquals(
+    resp.headers.get("content-type"),
+    "text/html; charset=utf-8",
+  );
+  assertEquals(resp.status, 500);
+});
+
+Deno.test("[e2e] GET /blog", async () => {
+  const resp = await handler(
+    new Request("http://localhost/blog"),
+  );
+
+  assert(resp.ok);
+  assertInstanceOf(resp.body, ReadableStream);
+  assertEquals(
+    resp.headers.get("content-type"),
+    "text/html; charset=utf-8",
+  );
+  assertEquals(resp.status, 200);
+});
+
+Deno.test("[e2e] GET /pricing", async () => {
+  const resp = await handler(
+    new Request("http://localhost/pricing"),
+  );
+
+  assertFalse(resp.ok);
+  assertInstanceOf(resp.body, ReadableStream);
+  assertEquals(
+    resp.headers.get("content-type"),
+    "text/html; charset=utf-8",
+  );
+  assertEquals(resp.status, 404);
+});
+
+Deno.test("[e2e] GET /signin", async () => {
+  const resp = await handler(
+    new Request("http://localhost/signin"),
+  );
+
+  assertFalse(resp.ok);
+  assertFalse(resp.body);
+  assertStringIncludes(
+    resp.headers.get("location")!,
+    "https://github.com/login/oauth/authorize",
+  );
+  assertEquals(resp.status, 302);
+});
+
+Deno.test("[e2e] GET /signout", async () => {
+  const resp = await handler(
+    new Request("http://localhost/signout"),
+  );
+
+  assertFalse(resp.ok);
+  assertFalse(resp.body);
+  assertEquals(resp.headers.get("location"), "/");
+  assertEquals(resp.status, 302);
+});
+
+Deno.test("[e2e] GET /dashboard", async () => {
+  const resp = await handler(
+    new Request("http://localhost/dashboard"),
+  );
+
+  assertFalse(resp.ok);
+  assertFalse(resp.body);
+  assertEquals(resp.headers.get("location"), "/signin");
+  assertEquals(resp.status, 303);
+});
+
+Deno.test("[e2e] GET /dashboard/stats", async () => {
+  const resp = await handler(
+    new Request("http://localhost/dashboard/stats"),
+  );
+
+  assertFalse(resp.ok);
+  assertFalse(resp.body);
+  assertEquals(resp.headers.get("location"), "/signin");
+  assertEquals(resp.status, 303);
+});
+
+Deno.test("[e2e] GET /dashboard/users", async () => {
+  const resp = await handler(
+    new Request("http://localhost/dashboard/users"),
+  );
+
+  assertFalse(resp.ok);
+  assertFalse(resp.body);
+  assertEquals(resp.headers.get("location"), "/signin");
+  assertEquals(resp.status, 303);
+});
+
+Deno.test("[e2e] GET /submit", async () => {
+  const resp = await handler(
+    new Request("http://localhost/submit"),
+  );
+
+  assertFalse(resp.ok);
+  assertFalse(resp.body);
+  assertEquals(resp.headers.get("location"), "/signin");
+  assertEquals(resp.status, 303);
+});
+
+Deno.test("[e2e] GET /feed", async () => {
+  const resp = await handler(
+    new Request("http://localhost/feed"),
+  );
+
+  assert(resp.ok);
+  assertInstanceOf(resp.body, ReadableStream);
+  assertEquals(
+    resp.headers.get("content-type"),
+    "application/atom+xml; charset=utf-8",
+  );
+  assertEquals(resp.status, 200);
+});
+
+Deno.test("[e2e] GET /api/items", async () => {
+  const item1 = genNewItem();
+  const item2 = genNewItem();
+  await createItem(item1);
+  await createItem(item2);
+
+  const req = new Request("http://localhost/api/items");
+  const resp = await handler(req);
+
+  const { values } = await resp.json();
+  assertResponseJson(resp);
+  assertArrayIncludes(values, [
+    JSON.parse(JSON.stringify(item1)),
+    JSON.parse(JSON.stringify(item2)),
+  ]);
+});
+
+Deno.test("[e2e] GET /api/items/[id]", async () => {
+  const item = genNewItem();
+  const req = new Request("http://localhost/api/items/" + item.id);
+
+  const resp1 = await handler(req);
+  assertFalse(resp1.ok);
+  assertEquals(await resp1.text(), "Item not found");
+  assertEquals(resp1.status, Status.NotFound);
+
+  await createItem(item);
+  const resp2 = await handler(req);
+  assertResponseJson(resp2);
+  assertEquals(await resp2.json(), JSON.parse(JSON.stringify(item)));
+});
+
+Deno.test("[e2e] GET /api/items/[id]/comments", async () => {
+  const item = genNewItem();
+  const comment: Comment = {
+    ...genNewComment(),
+    itemId: item.id,
+  };
+  const req = new Request(`http://localhost/api/items/${item.id}/comments`);
+
+  const resp1 = await handler(req);
+  assertFalse(resp1.ok);
+  assertEquals(await resp1.text(), "Item not found");
+  assertEquals(resp1.status, Status.NotFound);
+
+  await createItem(item);
+  await createComment(comment);
+  const resp2 = await handler(req);
+  const { values } = await resp2.json();
+  assertResponseJson(resp2);
+  assertEquals(values, [JSON.parse(JSON.stringify(comment))]);
+});
+
+Deno.test("[e2e] POST /api/items", async () => {
+  const resp = await handler(
+    new Request("http://localhost/api/items", { method: "POST" }),
+  );
+
+  assertFalse(resp.ok);
+  assertEquals(await resp.text(), "User must be signed in");
+  assertEquals(resp.status, Status.Unauthorized);
+});
+
+Deno.test("[e2e] GET /api/users", async () => {
+  const user1 = genNewUser();
+  const user2 = genNewUser();
+  await createUser(user1);
+  await createUser(user2);
+
+  const req = new Request("http://localhost/api/users");
+  const resp = await handler(req);
+
+  const { values } = await resp.json();
+  assertResponseJson(resp);
+  assertArrayIncludes(values, [user1, user2]);
+});
+
+Deno.test("[e2e] GET /api/users/[login]", async () => {
+  const user = genNewUser();
+  const req = new Request("http://localhost/api/users/" + user.login);
+
+  const resp1 = await handler(req);
+  assertFalse(resp1.ok);
+  assertEquals(await resp1.text(), "User not found");
+  assertEquals(resp1.status, Status.NotFound);
+
+  await createUser(user);
+  const resp2 = await handler(req);
+  assertResponseJson(resp2);
+  assertEquals(await resp2.json(), user);
+});
+
+Deno.test("[e2e] GET /api/users/[login]/items", async () => {
+  const user = genNewUser();
+  const item: Item = {
+    ...genNewItem(),
+    userLogin: user.login,
+  };
+  const req = new Request(`http://localhost/api/users/${user.login}/items`);
+
+  const resp1 = await handler(req);
+  assertResponseNotFound(resp1);
+
+  await createUser(user);
+  await createItem(item);
+
+  const resp2 = await handler(req);
+  const { values } = await resp2.json();
+  assertResponseJson(resp2);
+  assertArrayIncludes(values, [JSON.parse(JSON.stringify(item))]);
+});
+
+Deno.test("[e2e] GET /api/users/[login]/notifications", async () => {
+  const user = genNewUser();
+  const notification: Notification = {
+    ...genNewNotification(),
+    userLogin: user.login,
+  };
+  const url = "http://localhost/api/me/notifications";
+
+  const resp1 = await handler(new Request(url));
+  assertFalse(resp1.ok);
+  assertEquals(resp1.status, Status.Unauthorized);
+
+  await createUser(user);
+  await createNotification(notification);
+
+  const resp2 = await handler(
+    new Request(url, {
+      headers: { cookie: "site-session=" + user.sessionId },
+    }),
+  );
+  const { values } = await resp2.json();
+  assertResponseJson(resp2);
+  assertArrayIncludes(values, [
+    JSON.parse(JSON.stringify(notification)),
+  ]);
 });