adding pre/post hooks for tests
Merge branch 'master' into develop

* master:
  adding pre/post hooks for tests