Fixed test.
Merge branch 'develop'