Test structure now has proper directory structure
Updated Tomcat versions