Test restructured.