All for DataShuffler implemented; Still some test errors