Merage test to tomcat