Fixed failing tests
Merge branch 'develop'

* develop:
  Fixed failing tests