emedded Tomcat7 and refactored tests to use it