Update and copy some servlet tests