Fixed broken tests
Merge branch 'develop'