Fixing tests folder error
Merge branch 'develop'
Updating CHANGELOG