Issues #34 and #42

Hi,

I've added tests for issues #34 and #42. Both are demonstrating the problem cases and failing at the moment, but I'm going to fix them here..