Tests for automagic splitting, and small tweak uncovered during testing