Changed the folder structure for tests