Hook execution sequence issue

1) Expected onComplete to be executed in all cases at the very end.
2) in testExecutionHookRunFailureWithFallback - onComplete executed twice. 

Unit test changes demonstrating these issues.