Test restructure