Restructure test files a bit