Added Servlet Facet + tests