More test coverage and make better error message
Merge branch 'version-0.03'