Right now there are specific test modules for Tomcat 6 and Tomcat 7. We should unify them into single test module with version-specific profiles (similarly to Jetty containers).