More test coverage
Merge branch 'version0.04'