Added Tomcat Support
Increased Integration Test Coverage