Modifying test files to adapt to new folder structure.