Add unit test
Merge branch 'develop'
Add of the setup