Fix issue #11
Add another test that currently fails