change test file structure