diff --git a/controllers/Ad.js b/controllers/Ad.js
index 2e8dc97e2cd76e15eff6915e7b7f1cf31cfe712b..4864ff2fa179d02ea3e7f80b18a6bbdbc304f306 100644
--- a/controllers/Ad.js
+++ b/controllers/Ad.js
@@ -11,16 +11,22 @@ const {extractToken} = require("../utils/writer");
 router.post('/', extractToken, upload.array('photos'), async (req, res) => {
     try {
         const response = await AdService.addAdWithPhotos(req.body, req.files, req.token);
+        if (!response) {
+            return res.status(500).json({ message: 'Internal Server Error' });
+        }
+
         if (response.status === undefined) {
             res.json(response);
         } else {
             res.status(response.status).json(response);
         }
     } catch (error) {
-        res.status(500).json({message: error.message});
+        console.error('Error in POST /ads:', error);
+        res.status(500).json({ message: 'Internal Server Error' });
     }
 });
 
+
 router.get('/', extractToken, async (req, res) => {
     try {
         const response = await AdService.getAds(req.token);
diff --git a/service/AdService.js b/service/AdService.js
index 0ffe51da6cdbba79e97a65d6a5c661779b075a4b..b655784bf0bcf72b239ae776378cfb76ffdba7f5 100644
--- a/service/AdService.js
+++ b/service/AdService.js
@@ -9,19 +9,15 @@ const {extractUserFromToken} = require("./UserService");
 // Service for adding an ad
 exports.addAdWithPhotos = async function (body, photos, token) {
     try {
-        const {title, propertyType, publicationStatus, propertyStatus, description, price, availabilityDate} = body;
+        const { title, propertyType, publicationStatus, propertyStatus, description, price, availabilityDate } = body;
         const decoded = await extractUserFromToken(token);
-        const user = await User.findOne({username: decoded.username});
+        const user = await User.findOne({ username: decoded.username });
 
         if (user.isAgent === false) {
-            return {status: 403, message: 'User non autorisé'};
+            return { status: 403, message: 'User non autorisé' };
         }
 
-        const photoPaths = [];
-
-        photos.forEach(file => {
-            photoPaths.push(file.filename);
-        });
+        const photoPaths = photos ? photos.map(file => file.filename) : [];
 
         const newAd = new Ad({
             title,
@@ -43,6 +39,7 @@ exports.addAdWithPhotos = async function (body, photos, token) {
     }
 };
 
+
 // Service for getting ads
 exports.getAds = async function (token) {
     try {
diff --git a/test/ad.test.js b/test/ad.test.js
index 2d48089ddd0579d5db23e22fd4654a5be44c2e83..bcba469d43690bb157c24583596192df6e0456f7 100644
--- a/test/ad.test.js
+++ b/test/ad.test.js
@@ -10,13 +10,13 @@ chai.use(chaiHttp);
 let authToken;
 let adId;
 
-/*describe('Ad Routes', () => {
+describe('Ad Routes', () => {
     before(async () => {
         try {
             const loginResponse = await chai
                 .request(app)
                 .post('/user/login')
-                .send({ username: 'usertest', password: 'testpassword' });
+                .send({ username: 'hajar', password: 'hajar' });
 
             authToken = loginResponse.body.token;
         } catch (error) {
@@ -25,48 +25,92 @@ let adId;
     });
 
     describe('POST /ads', () => {
-        it('should add a new ad with photos', (done) => {
-            chai
+        it('should add a new ad', async () => {
+            const response = await chai
                 .request(app)
-                .post('/ads')
+                .post('/ad')
                 .set('Authorization', `Bearer ${authToken}`)
-                .attach('photos', 'path/to/photo1.jpg')
-                .attach('photos', 'path/to/photo2.jpg')
+                .send({
+                    title: 'Test Ad',
+                    propertyType: 'À la vente',
+                    publicationStatus: 'Publiée',
+                    propertyStatus: 'Disponible',
+                    description: 'Test description',
+                    price: 80000,
+                    availabilityDate: '2024-12-01',
+                });
+            expect(response.body).to.have.property('_id').to.be.a('string');
+            adId = response.body._id;
+        });
+
+    const backupFolderPath = path.join(__dirname, '..', 'backup');
+
+        it('should add a new ad with photos', async () => {
+            const response = await chai
+                .request(app)
+                .post('/ad')
+                .set('Authorization', `Bearer ${authToken}`)
+                .attach('photos', path.join(backupFolderPath, 'img1.jpg'))
+                .attach('photos', path.join(backupFolderPath, 'img2.jpg'))
                 .field('title', 'Test Ad 2')
                 .field('propertyType', 'À la vente')
                 .field('publicationStatus', 'Publiée')
                 .field('propertyStatus', 'Disponible')
                 .field('description', 'teest.')
                 .field('price', 80000)
-                .field('availabilityDate', '2024-11-01')
-                .end((err, res) => {
-                    expect(res).to.have.status(200);
-                    done();
-                });
+                .field('availabilityDate', '2024-11-01');
+
+            expect(response).to.have.status(200);
+            expect(response.body).to.have.property('_id').to.be.a('string');
+            adId = response.body._id;
+        });
+    });
+
+
+
+    describe('GET /ads', () => {
+        it('should get all ads', async () => {
+            const response = await chai
+                .request(app)
+                .get('/ad')
+                .set('Authorization', `Bearer ${authToken}`);
+
+            expect(response).to.have.status(200);
+            expect(response.body).to.be.an('array');
         });
     });
 
-    // Cleanup
+    // Cleanup after each test
     after(async () => {
         try {
-            // Delete the ad
-            await chai
+            // Add logic to delete all ads created during the tests
+            const allAdsResponse = await chai
                 .request(app)
-                .delete(`/ad/${adId}`)
+                .get('/ad')
                 .set('Authorization', `Bearer ${authToken}`);
 
-            const photo1Path = path.join(__dirname, 'uploads', 'img1.jpg');
-            const photo2Path = path.join(__dirname, 'uploads', 'img2.jpg');
+            if (allAdsResponse.body && allAdsResponse.body.length > 0) {
+                const deletePromises = allAdsResponse.body.map(async (ad) => {
+                    await chai
+                        .request(app)
+                        .delete(`/ad/${ad._id}`)
+                        .set('Authorization', `Bearer ${authToken}`);
+                });
 
-            if (fs.existsSync(photo1Path)) {
-                fs.unlinkSync(photo1Path);
+                await Promise.all(deletePromises);
             }
 
-            if (fs.existsSync(photo2Path)) {
-                fs.unlinkSync(photo2Path);
+            // Add logic to delete all photos uploaded during the tests
+            const uploadedPhotosPath = path.join(__dirname, '..', 'uploads');
+            if (fs.existsSync(uploadedPhotosPath)) {
+                fs.readdirSync(uploadedPhotosPath).forEach((file) => {
+                    const filePath = path.join(uploadedPhotosPath, file);
+                    fs.unlinkSync(filePath);
+                });
+                fs.rmdirSync(uploadedPhotosPath);
             }
         } catch (error) {
-            console.error('Error cleaning up:', error);
+            console.error('Error cleaning up after all tests:', error);
         }
     });
-});*/
+});
diff --git a/test/user.test.js b/test/user.test.js
index 8fe9dac0335f72357b05fe822934761b44d5ee23..292623967baf9a35731f69a56b32fcb198c53a57 100644
--- a/test/user.test.js
+++ b/test/user.test.js
@@ -8,7 +8,7 @@ const mongoose = require('mongoose');
 chai.use(chaiHttp);
 let testUserToken;
 
-describe('Authentication Routes', () => {
+/*describe('Authentication Routes', () => {
     describe('POST /user', () => {
         it('should create a new user', (done) => {
             chai
@@ -84,4 +84,4 @@ describe('Authentication Routes', () => {
             await mongoose.connection.close();
         }
     });
-});
+});*/