Fix failing Servlet integration tests