Reordered splits
Oh this changed
Fix uses for tests