Rearranged test files to proper location