Fix remainder of failing tests and a related TODO spotted in the tests as well.

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