Develop
Added testing to develop
Merge branch 'develop'