Removed some debugging code.
Set longer timeouts on a couple of tests so they don't fail on my slow
old Solaris 11.1 machine.