Further test restructuring.