Two of us have got this wrong so separate the tests to make the logic clearer and increase the timeout to 10s.

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