Fixed tests after added deprecation notice.
Merged pull request #445
Merge branch 'v1.4'