#264 use renamed method in test
Merge branch 'master' into develop