restructured test directory