Simplify

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1487604 13f79535-47bb-0310-9956-ffa450edef68
More test code - sorry for the noise

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1487618 13f79535-47bb-0310-9956-ffa450edef68