Modify old-style test directory structure