more tests added
Merge branch 'develop'