Sorry, that's my fault. 
I'll revert this cleanup and add few more tests for those cases.