More test reorganization.