Adding a lot more info to test output, firing retry code on all errors, making sure timeout won't accidentally occur too close to last data read/write