Clean up promise-based unit tests

[oliverwoodings]

Need to make sure all tests that use promises properly invoke done in catch statements, otherwise unit tests just time out and take ages to run.