reorganized test directory