Adding and fixing tests
Merge branch 'develop'

* develop:
  Adding and fixing tests