update testsetup
Merge branch 'develop' into qa

* develop:
  update testsetup