Issue 25 - WIP - Test case showing problem