Improve import/export for split (still not passing)