Fixed failing test from commit #74a2f3d8

Also very tiny adjustment on change event hook