Modify old test directory structure