Test for Issue #205
Add more tests, following issue #143