Merge branch 'develop'
1. Remove tests