more test coverage
Merge branch 'version-1.5'