Restructure test files