test restructure