updated tomcat versions && fixed tests