More test reorganization