Add failing test to replicate #175
Typo. Fix #175
Code cleanup