Merge "Refactor TestSplitOrganizer and remove useless code"