Rearranged test files