Refinements and fixes to NotifyHub, expansion of NotifyHub tests