diff --git a/CoffeeMachineSimulator/CoffeeMachineSimulator.Services/Interfaces/ICoffeeDataService.cs b/CoffeeMachineSimulator/CoffeeMachineSimulator.Services/Interfaces/ICoffeeDataService.cs
index e239f5f..3d6494e 100644
--- a/CoffeeMachineSimulator/CoffeeMachineSimulator.Services/Interfaces/ICoffeeDataService.cs
+++ b/CoffeeMachineSimulator/CoffeeMachineSimulator.Services/Interfaces/ICoffeeDataService.cs
@@ -1,4 +1,6 @@
-using CoffeeMachineSimulator.Sender.Model.CoffeeMachine.Simulator.Sender.Model;
+using CoffeeMachineSimulator.Data.Entities;
+using CoffeeMachineSimulator.Sender.Model.CoffeeMachine.Simulator.Sender.Model;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace CoffeeMachineSimulator.Services.Interfaces
@@ -6,5 +8,7 @@ namespace CoffeeMachineSimulator.Services.Interfaces
     public interface ICoffeeDataService
     {
         Task AddCoffeeData(CoffeeMachineData coffeeMachineData);
+        Task<List<CoffeeMachineData>> GetCoffeeDatas();
+        Task DeleteFirstCoffeeData();
     }
 }
diff --git a/CoffeeMachineSimulator/CoffeeMachineSimulator.Services/Services/CoffeeDataService.cs b/CoffeeMachineSimulator/CoffeeMachineSimulator.Services/Services/CoffeeDataService.cs
index 4dcc550..ebee847 100644
--- a/CoffeeMachineSimulator/CoffeeMachineSimulator.Services/Services/CoffeeDataService.cs
+++ b/CoffeeMachineSimulator/CoffeeMachineSimulator.Services/Services/CoffeeDataService.cs
@@ -3,6 +3,9 @@
 using CoffeeMachineSimulator.Data.Entities;
 using CoffeeMachineSimulator.Sender.Model.CoffeeMachine.Simulator.Sender.Model;
 using CoffeeMachineSimulator.Services.Interfaces;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace CoffeeMachineSimulator.Services.Services
@@ -19,10 +22,28 @@ public CoffeeDataService(CoffeeContext context, IMapper mapper)
         }
         public async Task AddCoffeeData(CoffeeMachineData coffeeMachineData)
         {
+            if (coffeeMachineData == null) throw new Exception("You should not add null entry");
+
             var myCoffeeDataToAdd = mapper.Map<CoffeeDataEntity>(coffeeMachineData);
 
             await coffeeContext.CoffeeDataEntities.AddAsync(myCoffeeDataToAdd);
             await coffeeContext.SaveChangesAsync();
         }
+
+        public async Task DeleteFirstCoffeeData()
+        {
+            var coffeeToDelete = await coffeeContext.CoffeeDataEntities.FirstOrDefaultAsync();
+
+            coffeeContext.CoffeeDataEntities.Remove(coffeeToDelete);
+
+            await coffeeContext.SaveChangesAsync();
+        }
+
+        public async Task<List<CoffeeMachineData>> GetCoffeeDatas()
+        {
+            var coffeeDataEntities = await coffeeContext.CoffeeDataEntities.ToListAsync();
+
+            return mapper.Map<List<CoffeeMachineData>>(coffeeDataEntities);
+        }
     }
 }
diff --git a/CoffeeMachineSimulator/CoffeeMachineSimulator.Tests/ServiceSetUp.cs b/CoffeeMachineSimulator/CoffeeMachineSimulator.Tests/ServiceSetUp.cs
index cbb15a3..9fbbd61 100644
--- a/CoffeeMachineSimulator/CoffeeMachineSimulator.Tests/ServiceSetUp.cs
+++ b/CoffeeMachineSimulator/CoffeeMachineSimulator.Tests/ServiceSetUp.cs
@@ -10,8 +10,7 @@ namespace CoffeeMachineSimulator.Tests
 {
     public class ServiceSetUp
     {
-        protected static readonly Guid CoffeeEspressorId = Guid.NewGuid();
-        protected static readonly Guid EspressorEspressorId = Guid.NewGuid();
+        
         protected readonly Mapper Mapper;
         protected CoffeeContext Context { get; private set; }
 
@@ -26,6 +25,8 @@ protected void SetUpDatabase()
             var options = new DbContextOptionsBuilder<CoffeeContext>()
                     .UseInMemoryDatabase(databaseName: "CoffeeDb")
                     .Options;
+            Guid CoffeeEspressorId = Guid.NewGuid();
+            Guid EspressorEspressorId = Guid.NewGuid();
 
             Context = new CoffeeContext(options);
 
@@ -36,6 +37,9 @@ protected void SetUpDatabase()
             Context.Coffees.Add(new CoffeeEntity { Name = "Second Coffee", Price = 30, Sweetness = Sweetness.Sweet, EspressoMachineId = EspressorEspressorId });
             Context.Coffees.Add(new CoffeeEntity { Name = "Third Coffee", Price = 45, Sweetness = Sweetness.LessSweet, EspressoMachineId = EspressorEspressorId });
 
+            Context.CoffeeDataEntities.Add(new CoffeeDataEntity { City = "Brasov", RecordingTime=DateTime.Now, SensorType="Sensor1", SensorValue=1, SerialNumber="12345" });
+            Context.CoffeeDataEntities.Add(new CoffeeDataEntity { City = "Cluj", RecordingTime = DateTime.Now, SensorType = "Sensor2", SensorValue = 2, SerialNumber = "12346" });
+
             Context.SaveChanges();
         }
 
diff --git a/CoffeeMachineSimulator/CoffeeMachineSimulator.Tests/Services/CoffeeDataServiceTests.cs b/CoffeeMachineSimulator/CoffeeMachineSimulator.Tests/Services/CoffeeDataServiceTests.cs
new file mode 100644
index 0000000..8daf8ef
--- /dev/null
+++ b/CoffeeMachineSimulator/CoffeeMachineSimulator.Tests/Services/CoffeeDataServiceTests.cs
@@ -0,0 +1,51 @@
+using CoffeeMachineSimulator.Sender.Model.CoffeeMachine.Simulator.Sender.Model;
+using CoffeeMachineSimulator.Services.Services;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace CoffeeMachineSimulator.Tests.Services
+{
+    [TestFixture]
+    public class CoffeeDataServiceTests : ServiceSetUp
+    {
+        private CoffeeDataService coffeeDataService;
+        public CoffeeDataServiceTests() : base() { }
+
+        [SetUp]
+        public void SetUp()
+        {
+            coffeeDataService = new CoffeeDataService(Context, Mapper);
+        }
+        [Test]
+        public async Task DeleteFirstCoffeeData_DeletesCoffeeData()
+        {
+            var expectedCountOfCoffeeDatas = (await coffeeDataService.GetCoffeeDatas()).Count;
+
+            await coffeeDataService.DeleteFirstCoffeeData();
+
+            var actualCountOfCoffeeDatas = (await coffeeDataService.GetCoffeeDatas()).Count;
+
+            Assert.AreNotEqual(expectedCountOfCoffeeDatas, actualCountOfCoffeeDatas);
+        }
+
+        [Test]
+        public void AddNullCoffeeData_Throws_NewException()
+        {
+            var ex = Assert.ThrowsAsync<Exception>(() => coffeeDataService.AddCoffeeData(null));
+
+            Assert.AreEqual(ex.Message, "You should not add null entry");
+        }
+
+        [Test]
+        public async Task GetCoffeeDatas_Returns_ListOfCoffeeDataEntities()
+        {
+            var coffeeDatasReturned = await coffeeDataService.GetCoffeeDatas();
+
+            Assert.IsNotNull(coffeeDatasReturned);
+            Assert.IsInstanceOf(typeof(List<CoffeeMachineData>), coffeeDatasReturned);
+        }
+    }
+
+}