Fixed typo in public interface.
Servlet metrics
Improve test a bit
Change the way the metrics collector works