Tests and fix for #94

Starting branch to fix #94. I have a failing test to start with.
I find having two lines with 'foo four' confusing, it is hard to understand the test with so many data line can you please reduce it?