More unit tests for error-reporting pointcuts, and some minor adjustments for duplicated handler methods.