FLUID-5268: Correction and test cases for new "afterDestroy" event