Rearranged test directory