Refactor a bunch of tests to call done with errors, rather than timeout

Currently doing a refactor which causes ~40 tests to fail, which takes AGES when 40 tests take 2 seconds each to time out...
So, this fixes that. Figured I submit this as a pull request separately, as it touches loads of files and if mixed with the actual refractor, it would be impossible to work out what was what