Reorganized test directory