Tomcat added for initial tests