Added unit tests
Merge branch 'develop'