Identify corner cases in which the module will fail

[michael-riddle]

There are instances where deferred resources won't do what we want or just flat out fail. Identify and fix those instances and then add tests for them.