restructure test files