More test restructuring.