Made tests turned off by default
Merge branch 'develop'