Fixed test problem
Merge branch 'develop'