Created a new option "TestTimeout". This was coupled with the HTTP timeout, so if you have a test that takes an hour you no longer need to set your HTTP Timeout to an hour and have to wait an hour before you know your service is down.