Restructure test.