Made IHookable tests more robust.
4 files changed