diff --git a/TestProject1/TestProject1.csproj b/TestProject1/TestProject1.csproj
index 55a8cc5..d36c781 100644
--- a/TestProject1/TestProject1.csproj
+++ b/TestProject1/TestProject1.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/TestProject1/TimeZoneConverterTest.cs b/TestProject1/TimeZoneConverterTest.cs
new file mode 100644
index 0000000..00d0fed
--- /dev/null
+++ b/TestProject1/TimeZoneConverterTest.cs
@@ -0,0 +1,27 @@
+using System;
+using NUnit.Framework;
+using TestProject1.TimeConverter;
+
+namespace TestProject1
+{
+    public class TimeZoneConverterTest
+    {
+        [Test]
+        public void TimeZone_Is_Converted_To_EasternTimeZone()
+        {
+            var timeShouldBe = TimeZoneInfo.ConvertTimeBySystemTimeZoneId(DateTime.Now, "Eastern Standard Time");
+            var timeIs = TimeZoneConverter.ConvertToEst(DateTime.Now);
+
+            Assert.AreEqual(timeShouldBe.Second, timeIs.Second);
+        }
+
+        [Test]
+        public void TimeZone_Is_Converted_To_UTC()
+        {
+            var timeShouldBe = TimeZoneInfo.ConvertTimeToUtc(DateTime.Now);
+            var timeIs = TimeZoneConverter.ConvertToUtc(DateTime.Now);
+            Assert.AreEqual(timeShouldBe.Second, timeIs.Second);
+        }
+    }
+
+}
diff --git a/TestProject2/TestProject2.csproj b/TestProject2/TestProject2.csproj
index 55a8cc5..d36c781 100644
--- a/TestProject2/TestProject2.csproj
+++ b/TestProject2/TestProject2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/TestProject2/UserRepositoryTest.cs b/TestProject2/UserRepositoryTest.cs
new file mode 100644
index 0000000..9719203
--- /dev/null
+++ b/TestProject2/UserRepositoryTest.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using TestProject2.BL;
+using System.Linq;
+
+namespace TestProject2
+{
+    public class UserRepositoryTest
+    {
+        UserRepository userRepo = new UserRepository();
+
+        [Test]
+        public void Returns_User_By_Id_Equals_1()
+        {
+            var user = TestData.LocalUsers1.FirstOrDefault();
+            var userReturnedByMethod = userRepo.GetUserInfo(1);
+            Assert.AreEqual(user, userReturnedByMethod);
+        }
+
+        [Test]
+        public void Throws_Exception_When_Id_Equals_7()
+        {
+            Assert.Throws<NullReferenceException>(() => userRepo.GetUserInfo(7));
+        }
+    }
+}
diff --git a/TestProject2/UserValidityTest.cs b/TestProject2/UserValidityTest.cs
new file mode 100644
index 0000000..cca6bd1
--- /dev/null
+++ b/TestProject2/UserValidityTest.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using TestProject2.BL;
+using NUnit.Framework;
+using System.Linq;
+
+namespace TestProject2
+{
+    class UserValidityTest
+    {
+        [Test]
+        public void User_Exists()
+        {
+            var user = new User() { Id = 3, UserName = "test3", CreatedAt = DateTime.UtcNow, CompanyId = 1, ContactId = 6 };
+            var exists = TestData.LocalUsers1.Any(x => x.Id == user.Id 
+                                                  && x.UserName.Equals(user.UserName) 
+                                                  && x.CompanyId == user.CompanyId
+                                                  && x.ContactId == user.ContactId);
+            Assert.AreEqual(true, exists);
+        }
+
+        [Test]
+        public void User_Does_Not_Exist()
+        {
+            var user = new User() { Id = 3, UserName = "test10", CreatedAt = DateTime.UtcNow, CompanyId = 1, ContactId = 6 };
+            var exists = TestData.LocalUsers1.Any(x => x.Id == user.Id
+                                                  && x.UserName.Equals(user.UserName)
+                                                  && x.CompanyId == user.CompanyId
+                                                  && x.ContactId == user.ContactId);
+            Assert.AreEqual(false, exists);
+        }
+    }
+}