JSP integration cleanup + JSP acceptance tests