Resolved testing bugs
Merge branch 'develop'