Log asynchronous request timeouts as errors
Improve test code layout