Add tests for Issue#13 / PR #13