Checking there are future calls left before trying to call it to send error notifications.
Also, breaking tests into two that should really be separate tests (and were throwing future limit exceptions).