Add initial test
Merge branch 'develop'