Renaming in tests incomplete.
Merge branch 'develop'