Add failing test for #6
Fix #6
Document changes