Restructure test