Test restructuring