* Improved tests
Merge branch 'hotfix/2.8.2'

* hotfix/2.8.2:
  * Improved tests