Updated the tests and config.xml to account for the recent changes in the folder structure