Merge change 2456

* changes:
  add tests for new pause/resume events