add unit tests from issue #93
Merge remote-tracking branch 'origin/fix-93'