fix tests
Merge branch 'master' into add-close-button-to-overlay

* master:
  fix tests