cleaning up NewShuffleSplit() and unittests