Line splitter change and test cases, should fix #12