Test data reorganization