Small fix to placement
Update all tests to assume split on import when possible
Add support for splitting on import