minor test rearrangement