Tests updated as well and all the middleware. And Prometheus renamed to
metrics (directive is still prometheus).