tests reorganization