more test coverage
Merge branch 'version-0.05'