Added tests to test splitting.  Found bugs in the process.