add tests for PR #11 fixes