Update tests.
Merge branch 'develop'