restructure test