Move tests infra to look like all other middleware, and some small cleanups.
Attach a file by drag & drop or click to upload
