Adding tests
Adding CHANGELOG
Merge branch 'develop'