Bug 869016 - Remove promises
better tests for broken resources