#30 - supporting raising nonstandard (delegate) events
#30 - post-fix tidying and test name cleanup