Project Restructure P.1

8 files changed, 0 insertions, 1489 deletions

diff --git a/src/DevHive.Tests/DevHive.Web.Tests/CommentController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/CommentController.Tests.cs
deleted file mode 100644
index 3a03f1a..0000000
--- a/src/DevHive.Tests/DevHive.Web.Tests/CommentController.Tests.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
-using DevHive.Services.Interfaces;
-using DevHive.Services.Models.Comment;
-using DevHive.Web.Controllers;
-using DevHive.Web.Models.Comment;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using NUnit.Framework;
-
-namespace DevHive.Web.Tests
-{
-	[TestFixture]
-	public class CommentControllerTests
-	{
-		const string MESSAGE = "Gosho Trapov";
-		private Mock<ICommentService> CommentServiceMock { get; set; }
-		private Mock<IMapper> MapperMock { get; set; }
-		private CommentController CommentController { get; set; }
-
-		#region Setup
-		[SetUp]
-		public void SetUp()
-		{
-			this.CommentServiceMock = new Mock<ICommentService>();
-			this.MapperMock = new Mock<IMapper>();
-			this.CommentController = new CommentController(this.CommentServiceMock.Object, this.MapperMock.Object);
-		}
-		#endregion
-
-		#region Add
-		[Test]
-		public void AddComment_ReturnsOkObjectResult_WhenCommentIsSuccessfullyCreated()
-		{
-			Guid id = Guid.NewGuid();
-			CreateCommentWebModel createCommentWebModel = new CreateCommentWebModel
-			{
-				Message = MESSAGE
-			};
-			CreateCommentServiceModel createCommentServiceModel = new CreateCommentServiceModel
-			{
-				Message = MESSAGE
-			};
-
-			this.MapperMock.Setup(p => p.Map<CreateCommentServiceModel>(It.IsAny<CreateCommentWebModel>())).Returns(createCommentServiceModel);
-			this.CommentServiceMock.Setup(p => p.AddComment(It.IsAny<CreateCommentServiceModel>())).Returns(Task.FromResult(id));
-			this.CommentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.CommentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			var splitted = (result as OkObjectResult).Value
-				.ToString()
-				.Split('{', '}', '=', ' ')
-				.Where(x => !string.IsNullOrEmpty(x))
-				.ToArray();
-
-			Guid resultId = Guid.Parse(splitted[1]);
-
-			Assert.AreEqual(id, resultId);
-		}
-
-		[Test]
-		public void AddComment_ReturnsBadRequestObjectResult_WhenCommentIsNotCreatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			CreateCommentWebModel createCommentWebModel = new CreateCommentWebModel
-			{
-				Message = MESSAGE
-			};
-			CreateCommentServiceModel createCommentServiceModel = new CreateCommentServiceModel
-			{
-				Message = MESSAGE
-			};
-			string errorMessage = $"Could not create comment!";
-
-
-			this.MapperMock.Setup(p => p.Map<CreateCommentServiceModel>(It.IsAny<CreateCommentWebModel>())).Returns(createCommentServiceModel);
-			this.CommentServiceMock.Setup(p => p.AddComment(It.IsAny<CreateCommentServiceModel>())).Returns(Task.FromResult(Guid.Empty));
-			this.CommentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.CommentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult;
-			string resultMessage = badRequsetObjectResult.Value.ToString();
-
-			Assert.AreEqual(errorMessage, resultMessage);
-		}
-
-		[Test]
-		public void AddComment_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized()
-		{
-			Guid id = Guid.NewGuid();
-			CreateCommentWebModel createCommentWebModel = new CreateCommentWebModel
-			{
-				Message = MESSAGE
-			};
-
-			this.CommentServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.CommentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
-
-			Assert.IsInstanceOf<UnauthorizedResult>(result);
-		}
-		#endregion
-
-		#region Read
-		[Test]
-		public void GetById_ReturnsTheComment_WhenItExists()
-		{
-			Guid id = Guid.NewGuid();
-
-			ReadCommentServiceModel readCommentServiceModel = new ReadCommentServiceModel
-			{
-				Message = MESSAGE
-			};
-			ReadCommentWebModel readCommentWebModel = new ReadCommentWebModel
-			{
-				Message = MESSAGE
-			};
-
-			this.CommentServiceMock.Setup(p => p.GetCommentById(It.IsAny<Guid>())).Returns(Task.FromResult(readCommentServiceModel));
-			this.MapperMock.Setup(p => p.Map<ReadCommentWebModel>(It.IsAny<ReadCommentServiceModel>())).Returns(readCommentWebModel);
-
-			IActionResult result = this.CommentController.GetCommentById(id).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			OkObjectResult okObjectResult = result as OkObjectResult;
-			ReadCommentWebModel resultModel = okObjectResult.Value as Models.Comment.ReadCommentWebModel;
-
-			Assert.AreEqual(MESSAGE, resultModel.Message);
-		}
-		#endregion
-
-		#region Update
-		[Test]
-		public void Update_ShouldReturnOkResult_WhenCommentIsUpdatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			UpdateCommentWebModel updateCommentWebModel = new UpdateCommentWebModel
-			{
-				NewMessage = MESSAGE
-			};
-			UpdateCommentServiceModel updateCommentServiceModel = new UpdateCommentServiceModel
-			{
-				NewMessage = MESSAGE
-			};
-
-			this.CommentServiceMock.Setup(p => p.UpdateComment(It.IsAny<UpdateCommentServiceModel>())).Returns(Task.FromResult(id));
-			this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-			this.MapperMock.Setup(p => p.Map<UpdateCommentServiceModel>(It.IsAny<UpdateCommentWebModel>())).Returns(updateCommentServiceModel);
-
-			IActionResult result = this.CommentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			OkObjectResult okObjectResult = result as OkObjectResult;
-			object resultModel = okObjectResult.Value;
-			string[] resultAsString = resultModel.ToString().Split(' ').ToArray();
-
-			Assert.AreEqual(id.ToString(), resultAsString[3]);
-		}
-
-		[Test]
-		public void Update_ShouldReturnBadObjectResult_WhenCommentIsNotUpdatedSuccessfully()
-		{
-			string message = "Unable to update comment!";
-			UpdateCommentWebModel updateCommentWebModel = new UpdateCommentWebModel
-			{
-				NewMessage = MESSAGE
-			};
-			UpdateCommentServiceModel updateCommentServiceModel = new UpdateCommentServiceModel
-			{
-				NewMessage = MESSAGE
-			};
-
-			this.CommentServiceMock.Setup(p => p.UpdateComment(It.IsAny<UpdateCommentServiceModel>())).Returns(Task.FromResult(Guid.Empty));
-			this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-			this.MapperMock.Setup(p => p.Map<UpdateCommentServiceModel>(It.IsAny<UpdateCommentWebModel>())).Returns(updateCommentServiceModel);
-
-			IActionResult result = this.CommentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result;
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-
-		[Test]
-		public void Update_ShouldReturnUnauthorizedResult_WhenUserIsNotAuthorized()
-		{
-			UpdateCommentWebModel updateCommentWebModel = new UpdateCommentWebModel
-			{
-				NewMessage = MESSAGE
-			};
-
-			this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.CommentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result;
-
-			Assert.IsInstanceOf<UnauthorizedResult>(result);
-		}
-		#endregion
-
-		#region Delete
-		[Test]
-		public void Delete_ReturnsOkResult_WhenCommentIsDeletedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-
-			this.CommentServiceMock.Setup(p => p.DeleteComment(It.IsAny<Guid>())).Returns(Task.FromResult(true));
-			this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.CommentController.DeleteComment(id, null).Result;
-
-			Assert.IsInstanceOf<OkResult>(result);
-		}
-
-		[Test]
-		public void DeletComment_ReturnsBadRequestObjectResult_WhenCommentIsNotDeletedSuccessfully()
-		{
-			string message = "Could not delete Comment";
-			Guid id = Guid.NewGuid();
-
-			this.CommentServiceMock.Setup(p => p.DeleteComment(It.IsAny<Guid>())).Returns(Task.FromResult(false));
-			this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.CommentController.DeleteComment(id, null).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-
-		[Test]
-		public void DeletComment_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized()
-		{
-			this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.CommentController.DeleteComment(Guid.Empty, null).Result;
-
-			Assert.IsInstanceOf<UnauthorizedResult>(result);
-		}
-		#endregion
-	}
-}
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj b/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj
deleted file mode 100644
index a171e0b..0000000
--- a/src/DevHive.Tests/DevHive.Web.Tests/DevHive.Web.Tests.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Moq" Version="4.16.0" />
-    <PackageReference Include="NUnit" Version="3.13.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\DevHive.Web\DevHive.Web.csproj" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>latest</AnalysisLevel>
-  </PropertyGroup>
-</Project>
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/FeedController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/FeedController.Tests.cs
deleted file mode 100644
index 01f67e5..0000000
--- a/src/DevHive.Tests/DevHive.Web.Tests/FeedController.Tests.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using AutoMapper;
-using DevHive.Services.Interfaces;
-using DevHive.Services.Models;
-using DevHive.Web.Controllers;
-using DevHive.Web.Models.Comment;
-using DevHive.Web.Models.Feed;
-using DevHive.Web.Models.Post;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using NUnit.Framework;
-
-namespace DevHive.Web.Tests
-{
-	[TestFixture]
-	public class FeedControllerTests
-	{
-		private Mock<IFeedService> FeedServiceMock { get; set; }
-		private Mock<IMapper> MapperMock { get; set; }
-		private FeedController FeedController { get; set; }
-
-		#region SetUp
-		[SetUp]
-		public void SetUp()
-		{
-			this.FeedServiceMock = new Mock<IFeedService>();
-			this.MapperMock = new Mock<IMapper>();
-			this.FeedController = new FeedController(this.FeedServiceMock.Object, this.MapperMock.Object);
-		}
-		#endregion
-
-		#region GetPosts
-		[Test]
-		public async Task GetPosts_ReturnsOkObjectResultWithCorrectReadPageWebModel_WhenPostsExist()
-		{
-			GetPageWebModel getPageWebModel = new GetPageWebModel { };
-			GetPageServiceModel getPageServiceModel = new GetPageServiceModel { };
-			ReadPageServiceModel readPageServiceModel = new ReadPageServiceModel { };
-			ReadPageWebModel readPageWebModel = new ReadPageWebModel
-			{
-				Posts = new List<ReadPostWebModel>
-				{
-					new ReadPostWebModel(),
-					new ReadPostWebModel(),
-					new ReadPostWebModel()
-				}
-			};
-
-			this.FeedServiceMock.Setup(p => p.GetPage(It.IsAny<GetPageServiceModel>())).Returns(Task.FromResult(readPageServiceModel));
-			this.MapperMock.Setup(p => p.Map<GetPageServiceModel>(It.IsAny<GetPageWebModel>())).Returns(getPageServiceModel);
-			this.MapperMock.Setup(p => p.Map<ReadPageWebModel>(It.IsAny<ReadPageServiceModel>())).Returns(readPageWebModel);
-
-			IActionResult result = await this.FeedController.GetPosts(Guid.Empty, getPageWebModel);
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			OkObjectResult okObjectResult = result as OkObjectResult;
-			ReadPageWebModel resultModel = okObjectResult.Value as Models.Comment.ReadPageWebModel;
-
-			Assert.AreEqual(3, resultModel.Posts.Count);
-		}
-		#endregion
-
-		#region GetUserPosts
-		[Test]
-		public async Task GetUserPosts_GetsPostsOfUser_WhenTheyExist()
-		{
-			GetPageWebModel getPageWebModel = new GetPageWebModel { };
-			GetPageServiceModel getPageServiceModel = new GetPageServiceModel { };
-			ReadPageServiceModel readPageServiceModel = new ReadPageServiceModel { };
-			ReadPageWebModel readPageWebModel = new ReadPageWebModel
-			{
-				Posts = new List<ReadPostWebModel>
-				{
-					new ReadPostWebModel(),
-					new ReadPostWebModel(),
-					new ReadPostWebModel()
-				}
-			};
-
-			this.FeedServiceMock.Setup(p => p.GetUserPage(It.IsAny<GetPageServiceModel>())).Returns(Task.FromResult(readPageServiceModel));
-			this.MapperMock.Setup(p => p.Map<GetPageServiceModel>(It.IsAny<GetPageWebModel>())).Returns(getPageServiceModel);
-			this.MapperMock.Setup(p => p.Map<ReadPageWebModel>(It.IsAny<ReadPageServiceModel>())).Returns(readPageWebModel);
-
-			IActionResult result = await this.FeedController.GetUserPosts(null, getPageWebModel);
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			OkObjectResult okObjectResult = result as OkObjectResult;
-			ReadPageWebModel resultModel = okObjectResult.Value as Models.Comment.ReadPageWebModel;
-
-			Assert.AreEqual(3, resultModel.Posts.Count);
-		}
-		#endregion
-	}
-}
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/LanguageController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/LanguageController.Tests.cs
deleted file mode 100644
index 7c8d64e..0000000
--- a/src/DevHive.Tests/DevHive.Web.Tests/LanguageController.Tests.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
-using DevHive.Services.Interfaces;
-using DevHive.Services.Models.Language;
-using DevHive.Web.Controllers;
-using DevHive.Web.Models.Language;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using NUnit.Framework;
-
-namespace DevHive.Web.Tests
-{
-	[TestFixture]
-	public class LanguageControllerTests
-	{
-		const string NAME = "Gosho Trapov";
-		private Mock<ILanguageService> LanguageServiceMock { get; set; }
-		private Mock<IMapper> MapperMock { get; set; }
-		private LanguageController LanguageController { get; set; }
-
-		[SetUp]
-		public void SetUp()
-		{
-			this.LanguageServiceMock = new Mock<ILanguageService>();
-			this.MapperMock = new Mock<IMapper>();
-			this.LanguageController = new LanguageController(this.LanguageServiceMock.Object, this.MapperMock.Object);
-		}
-
-		#region Create
-		[Test]
-		public void CreateLanguage_ReturnsOkObjectResult_WhenLanguageIsSuccessfullyCreated()
-		{
-			CreateLanguageWebModel createLanguageWebModel = new CreateLanguageWebModel
-			{
-				Name = NAME
-			};
-			CreateLanguageServiceModel createLanguageServiceModel = new CreateLanguageServiceModel
-			{
-				Name = NAME
-			};
-			Guid id = Guid.NewGuid();
-
-			this.MapperMock.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>())).Returns(createLanguageServiceModel);
-			this.LanguageServiceMock.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>())).Returns(Task.FromResult(id));
-
-			IActionResult result = this.LanguageController.Create(createLanguageWebModel).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			var splitted = (result as OkObjectResult).Value
-				.ToString()
-				.Split('{', '}', '=', ' ')
-				.Where(x => !string.IsNullOrEmpty(x))
-				.ToArray();
-
-			Guid resultId = Guid.Parse(splitted[1]);
-
-			Assert.AreEqual(id, resultId);
-		}
-
-		[Test]
-		public void CreateLanguage_ReturnsBadRequestObjectResult_WhenLanguageIsNotCreatedSuccessfully()
-		{
-			CreateLanguageWebModel createTechnologyWebModel = new CreateLanguageWebModel
-			{
-				Name = NAME
-			};
-			CreateLanguageServiceModel createTechnologyServiceModel = new CreateLanguageServiceModel
-			{
-				Name = NAME
-			};
-			Guid id = Guid.Empty;
-			string errorMessage = $"Could not create language {NAME}";
-
-			this.MapperMock.Setup(p => p.Map<CreateLanguageServiceModel>(It.IsAny<CreateLanguageWebModel>())).Returns(createTechnologyServiceModel);
-			this.LanguageServiceMock.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>())).Returns(Task.FromResult(id));
-
-			IActionResult result = this.LanguageController.Create(createTechnologyWebModel).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult;
-			string resultMessage = badRequsetObjectResult.Value.ToString();
-
-			Assert.AreEqual(errorMessage, resultMessage);
-		}
-		#endregion
-
-		#region Read
-		[Test]
-		public void GetById_ReturnsTheLanguage_WhenItExists()
-		{
-			Guid id = Guid.NewGuid();
-
-			ReadLanguageServiceModel readLanguageServiceModel = new ReadLanguageServiceModel
-			{
-				Name = NAME
-			};
-			ReadLanguageWebModel readLanguageWebModel = new ReadLanguageWebModel
-			{
-				Name = NAME
-			};
-
-			this.LanguageServiceMock.Setup(p => p.GetLanguageById(It.IsAny<Guid>())).Returns(Task.FromResult(readLanguageServiceModel));
-			this.MapperMock.Setup(p => p.Map<ReadLanguageWebModel>(It.IsAny<ReadLanguageServiceModel>())).Returns(readLanguageWebModel);
-
-			IActionResult result = this.LanguageController.GetById(id).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			OkObjectResult okObjectResult = result as OkObjectResult;
-			ReadLanguageWebModel resultModel = okObjectResult.Value as Models.Language.ReadLanguageWebModel;
-
-			Assert.AreEqual(NAME, resultModel.Name);
-		}
-		#endregion
-
-		#region Update
-		[Test]
-		public void Update_ShouldReturnOkResult_WhenLanguageIsUpdatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			UpdateLanguageWebModel updateLanguageWebModel = new UpdateLanguageWebModel
-			{
-				Name = NAME
-			};
-			UpdateLanguageServiceModel updateLanguageServiceModel = new UpdateLanguageServiceModel
-			{
-				Name = NAME
-			};
-
-			this.LanguageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>())).Returns(Task.FromResult(true));
-			this.MapperMock.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>())).Returns(updateLanguageServiceModel);
-
-			IActionResult result = this.LanguageController.Update(id, updateLanguageWebModel).Result;
-
-			Assert.IsInstanceOf<OkResult>(result);
-		}
-
-		[Test]
-		public void Update_ShouldReturnBadObjectResult_WhenLanguageIsNotUpdatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			string message = "Could not update Language";
-			UpdateLanguageWebModel updateLanguageWebModel = new UpdateLanguageWebModel
-			{
-				Name = NAME
-			};
-			UpdateLanguageServiceModel updateLanguageServiceModel = new UpdateLanguageServiceModel
-			{
-				Name = NAME
-			};
-
-			this.LanguageServiceMock.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>())).Returns(Task.FromResult(false));
-			this.MapperMock.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>())).Returns(updateLanguageServiceModel);
-
-			IActionResult result = this.LanguageController.Update(id, updateLanguageWebModel).Result;
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-		#endregion
-
-		#region Delete
-		[Test]
-		public void Delete_ReturnsOkResult_WhenLanguageIsDeletedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-
-			this.LanguageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny<Guid>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.LanguageController.Delete(id).Result;
-
-			Assert.IsInstanceOf<OkResult>(result);
-		}
-
-		[Test]
-		public void Delet_ReturnsBadRequestObjectResult_WhenLanguageIsNotDeletedSuccessfully()
-		{
-			string message = "Could not delete Language";
-			Guid id = Guid.NewGuid();
-
-			this.LanguageServiceMock.Setup(p => p.DeleteLanguage(It.IsAny<Guid>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.LanguageController.Delete(id).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-		#endregion
-	}
-}
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/PostController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/PostController.Tests.cs
deleted file mode 100644
index 3a4e45e..0000000
--- a/src/DevHive.Tests/DevHive.Web.Tests/PostController.Tests.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
-using DevHive.Services.Interfaces;
-using DevHive.Services.Models.Post;
-using DevHive.Web.Controllers;
-using DevHive.Web.Models.Post;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using NUnit.Framework;
-
-namespace DevHive.Web.Tests
-{
-    [TestFixture]
-	public class PostControllerTests
-	{
-		const string MESSAGE = "Gosho Trapov";
-		private Mock<IPostService> PostServiceMock { get; set; }
-		private Mock<IMapper> MapperMock { get; set; }
-		private PostController PostController { get; set; }
-
-		[SetUp]
-		public void SetUp()
-		{
-			this.PostServiceMock = new Mock<IPostService>();
-			this.MapperMock = new Mock<IMapper>();
-			this.PostController = new PostController(this.PostServiceMock.Object, this.MapperMock.Object);
-		}
-
-		#region Create
-		[Test]
-		public void CreatePost_ReturnsOkObjectResult_WhenPostIsSuccessfullyCreated()
-		{
-			CreatePostWebModel createPostWebModel = new CreatePostWebModel
-			{
-				Message = MESSAGE
-			};
-			CreatePostServiceModel createPostServiceModel = new CreatePostServiceModel
-			{
-				Message = MESSAGE
-			};
-			Guid id = Guid.NewGuid();
-
-			this.MapperMock.Setup(p => p.Map<CreatePostServiceModel>(It.IsAny<CreatePostWebModel>())).Returns(createPostServiceModel);
-			this.PostServiceMock.Setup(p => p.CreatePost(It.IsAny<CreatePostServiceModel>())).Returns(Task.FromResult(id));
-			this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.PostController.Create(Guid.Empty, createPostWebModel, null).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			var splitted = (result as OkObjectResult).Value
-				.ToString()
-				.Split('{', '}', '=', ' ')
-				.Where(x => !string.IsNullOrEmpty(x))
-				.ToArray();
-
-			Guid resultId = Guid.Parse(splitted[1]);
-
-			Assert.AreEqual(id, resultId);
-		}
-
-		[Test]
-		public void CreatePost_ReturnsBadRequestObjectResult_WhenPostIsNotCreatedSuccessfully()
-		{
-			CreatePostWebModel createTechnologyWebModel = new CreatePostWebModel
-			{
-				Message = MESSAGE
-			};
-			CreatePostServiceModel createTechnologyServiceModel = new CreatePostServiceModel
-			{
-				Message = MESSAGE
-			};
-			Guid id = Guid.Empty;
-			string errorMessage = $"Could not create post!";
-
-			this.MapperMock.Setup(p => p.Map<CreatePostServiceModel>(It.IsAny<CreatePostWebModel>())).Returns(createTechnologyServiceModel);
-			this.PostServiceMock.Setup(p => p.CreatePost(It.IsAny<CreatePostServiceModel>())).Returns(Task.FromResult(id));
-			this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.PostController.Create(Guid.Empty, createTechnologyWebModel, null).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult;
-			string resultMessage = badRequsetObjectResult.Value.ToString();
-
-			Assert.AreEqual(errorMessage, resultMessage);
-		}
-
-		[Test]
-		public void CreatePost_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized()
-		{
-			Guid id = Guid.NewGuid();
-			CreatePostWebModel createPostWebModel = new CreatePostWebModel
-			{
-				Message = MESSAGE
-			};
-
-			this.PostServiceMock.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.PostController.Create(Guid.NewGuid(), createPostWebModel, null).Result;
-
-			Assert.IsInstanceOf<UnauthorizedResult>(result);
-		}
-		#endregion
-
-		#region Read
-		[Test]
-		public void GetById_ReturnsThePost_WhenItExists()
-		{
-			Guid id = Guid.NewGuid();
-
-			ReadPostServiceModel readPostServiceModel = new ReadPostServiceModel
-			{
-				Message = MESSAGE
-			};
-			ReadPostWebModel readPostWebModel = new ReadPostWebModel
-			{
-				Message = MESSAGE
-			};
-
-			this.PostServiceMock.Setup(p => p.GetPostById(It.IsAny<Guid>())).Returns(Task.FromResult(readPostServiceModel));
-			this.MapperMock.Setup(p => p.Map<ReadPostWebModel>(It.IsAny<ReadPostServiceModel>())).Returns(readPostWebModel);
-
-			IActionResult result = this.PostController.GetById(id).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			OkObjectResult okObjectResult = result as OkObjectResult;
-			ReadPostWebModel resultModel = okObjectResult.Value as Models.Post.ReadPostWebModel;
-
-			Assert.AreEqual(MESSAGE, resultModel.Message);
-		}
-		#endregion
-
-		#region Update
-		[Test]
-		public void Update_ShouldReturnOkResult_WhenPostIsUpdatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			UpdatePostWebModel updatePostWebModel = new UpdatePostWebModel
-			{
-				NewMessage = MESSAGE
-			};
-			UpdatePostServiceModel updatePostServiceModel = new UpdatePostServiceModel
-			{
-				NewMessage = MESSAGE
-			};
-
-			this.PostServiceMock.Setup(p => p.UpdatePost(It.IsAny<UpdatePostServiceModel>())).Returns(Task.FromResult(id));
-			this.MapperMock.Setup(p => p.Map<UpdatePostServiceModel>(It.IsAny<UpdatePostWebModel>())).Returns(updatePostServiceModel);
-			this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.PostController.Update(id, updatePostWebModel, null).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-		}
-
-		[Test]
-		public void Update_ShouldReturnBadObjectResult_WhenPostIsNotUpdatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			string message = "Could not update post!";
-			UpdatePostWebModel updatePostWebModel = new UpdatePostWebModel
-			{
-				NewMessage = MESSAGE
-			};
-			UpdatePostServiceModel updatePostServiceModel = new UpdatePostServiceModel
-			{
-				NewMessage = MESSAGE
-			};
-
-			this.PostServiceMock.Setup(p => p.UpdatePost(It.IsAny<UpdatePostServiceModel>())).Returns(Task.FromResult(Guid.Empty));
-			this.MapperMock.Setup(p => p.Map<UpdatePostServiceModel>(It.IsAny<UpdatePostWebModel>())).Returns(updatePostServiceModel);
-			this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.PostController.Update(id, updatePostWebModel, null).Result;
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-
-		[Test]
-		public void Update_ShouldReturnUnauthorizedResult_WhenUserIsNotAuthorized()
-		{
-			UpdatePostWebModel updatePostWebModel = new UpdatePostWebModel
-			{
-				NewMessage = MESSAGE
-			};
-
-			this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.PostController.Update(Guid.Empty, updatePostWebModel, null).Result;
-
-			Assert.IsInstanceOf<UnauthorizedResult>(result);
-		}
-		#endregion
-
-		#region Delete
-		[Test]
-		public void Delete_ReturnsOkResult_WhenPostIsDeletedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-
-			this.PostServiceMock.Setup(p => p.DeletePost(It.IsAny<Guid>())).Returns(Task.FromResult(true));
-			this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.PostController.Delete(id, null).Result;
-
-			Assert.IsInstanceOf<OkResult>(result);
-		}
-
-		[Test]
-		public void Delete_ReturnsBadRequestObjectResult_WhenPostIsNotDeletedSuccessfully()
-		{
-			string message = "Could not delete Post";
-			Guid id = Guid.NewGuid();
-
-			this.PostServiceMock.Setup(p => p.DeletePost(It.IsAny<Guid>())).Returns(Task.FromResult(false));
-			this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.PostController.Delete(id, null).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-
-		[Test]
-		public void DeletePost_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized()
-		{
-			this.PostServiceMock.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.PostController.Delete(Guid.Empty, null).Result;
-
-			Assert.IsInstanceOf<UnauthorizedResult>(result);
-		}
-		#endregion
-	}
-}
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/RoleController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/RoleController.Tests.cs
deleted file mode 100644
index 067b4e4..0000000
--- a/src/DevHive.Tests/DevHive.Web.Tests/RoleController.Tests.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using AutoMapper;
-using DevHive.Services.Interfaces;
-using DevHive.Services.Models.Identity.Role;
-using DevHive.Web.Controllers;
-using DevHive.Web.Models.Identity.Role;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using NUnit.Framework;
-
-namespace DevHive.Web.Tests
-{
-    [TestFixture]
-	public class RoleControllerTests
-	{
-		const string NAME = "Gosho Trapov";
-		private Mock<IRoleService> RoleServiceMock { get; set; }
-		private Mock<IMapper> MapperMock { get; set; }
-		private RoleController RoleController { get; set; }
-
-		[SetUp]
-		public void SetUp()
-		{
-			this.RoleServiceMock = new Mock<IRoleService>();
-			this.MapperMock = new Mock<IMapper>();
-			this.RoleController = new RoleController(this.RoleServiceMock.Object, this.MapperMock.Object);
-		}
-
-		#region Create
-		[Test]
-		public void CreateRole_ReturnsOkObjectResult_WhenRoleIsSuccessfullyCreated()
-		{
-			CreateRoleWebModel createRoleWebModel = new CreateRoleWebModel
-			{
-				Name = NAME
-			};
-			CreateRoleServiceModel createRoleServiceModel = new CreateRoleServiceModel
-			{
-				Name = NAME
-			};
-			Guid id = Guid.NewGuid();
-
-			this.MapperMock.Setup(p => p.Map<CreateRoleServiceModel>(It.IsAny<CreateRoleWebModel>())).Returns(createRoleServiceModel);
-			this.RoleServiceMock.Setup(p => p.CreateRole(It.IsAny<CreateRoleServiceModel>())).Returns(Task.FromResult(id));
-
-			IActionResult result = this.RoleController.Create(createRoleWebModel).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			var splitted = (result as OkObjectResult).Value
-				.ToString()
-				.Split('{', '}', '=', ' ')
-				.Where(x => !string.IsNullOrEmpty(x))
-				.ToArray();
-
-			Guid resultId = Guid.Parse(splitted[1]);
-
-			Assert.AreEqual(id, resultId);
-		}
-
-		[Test]
-		public void CreateRole_ReturnsBadRequestObjectResult_WhenRoleIsNotCreatedSuccessfully()
-		{
-			CreateRoleWebModel createTechnologyWebModel = new CreateRoleWebModel
-			{
-				Name = NAME
-			};
-			CreateRoleServiceModel createTechnologyServiceModel = new CreateRoleServiceModel
-			{
-				Name = NAME
-			};
-			Guid id = Guid.Empty;
-			string errorMessage = $"Could not create role {NAME}";
-
-			this.MapperMock.Setup(p => p.Map<CreateRoleServiceModel>(It.IsAny<CreateRoleWebModel>())).Returns(createTechnologyServiceModel);
-			this.RoleServiceMock.Setup(p => p.CreateRole(It.IsAny<CreateRoleServiceModel>())).Returns(Task.FromResult(id));
-
-			IActionResult result = this.RoleController.Create(createTechnologyWebModel).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult;
-			string resultMessage = badRequsetObjectResult.Value.ToString();
-
-			Assert.AreEqual(errorMessage, resultMessage);
-		}
-		#endregion
-
-		#region Read
-		[Test]
-		public void GetById_ReturnsTheRole_WhenItExists()
-		{
-			Guid id = Guid.NewGuid();
-
-			RoleServiceModel roleServiceModel = new RoleServiceModel
-			{
-				Name = NAME
-			};
-			RoleWebModel roleWebModel = new RoleWebModel
-			{
-				Name = NAME
-			};
-
-			this.RoleServiceMock.Setup(p => p.GetRoleById(It.IsAny<Guid>())).Returns(Task.FromResult(roleServiceModel));
-			this.MapperMock.Setup(p => p.Map<RoleWebModel>(It.IsAny<RoleServiceModel>())).Returns(roleWebModel);
-
-			IActionResult result = this.RoleController.GetById(id).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			OkObjectResult okObjectResult = result as OkObjectResult;
-			RoleWebModel resultModel = okObjectResult.Value as Models.Identity.Role.RoleWebModel;
-
-			Assert.AreEqual(NAME, resultModel.Name);
-		}
-		#endregion
-
-		#region Update
-		[Test]
-		public void Update_ShouldReturnOkResult_WhenRoleIsUpdatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			UpdateRoleWebModel updateRoleWebModel = new UpdateRoleWebModel
-			{
-				Name = NAME
-			};
-			UpdateRoleServiceModel updateRoleServiceModel = new UpdateRoleServiceModel
-			{
-				Name = NAME
-			};
-
-			this.RoleServiceMock.Setup(p => p.UpdateRole(It.IsAny<UpdateRoleServiceModel>())).Returns(Task.FromResult(true));
-			this.MapperMock.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>())).Returns(updateRoleServiceModel);
-
-			IActionResult result = this.RoleController.Update(id, updateRoleWebModel).Result;
-
-			Assert.IsInstanceOf<OkResult>(result);
-		}
-
-		[Test]
-		public void Update_ShouldReturnBadObjectResult_WhenRoleIsNotUpdatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			string message = "Could not update role!";
-			UpdateRoleWebModel updateRoleWebModel = new UpdateRoleWebModel
-			{
-				Name = NAME
-			};
-			UpdateRoleServiceModel updateRoleServiceModel = new UpdateRoleServiceModel
-			{
-				Name = NAME
-			};
-
-			this.RoleServiceMock.Setup(p => p.UpdateRole(It.IsAny<UpdateRoleServiceModel>())).Returns(Task.FromResult(false));
-			this.MapperMock.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>())).Returns(updateRoleServiceModel);
-
-			IActionResult result = this.RoleController.Update(id, updateRoleWebModel).Result;
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-		#endregion
-
-		#region Delete
-		[Test]
-		public void Delete_ReturnsOkResult_WhenRoleIsDeletedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-
-			this.RoleServiceMock.Setup(p => p.DeleteRole(It.IsAny<Guid>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.RoleController.Delete(id).Result;
-
-			Assert.IsInstanceOf<OkResult>(result);
-		}
-
-		[Test]
-		public void Delet_ReturnsBadRequestObjectResult_WhenRoleIsNotDeletedSuccessfully()
-		{
-			string message = "Could not delete role!";
-			Guid id = Guid.NewGuid();
-
-			this.RoleServiceMock.Setup(p => p.DeleteRole(It.IsAny<Guid>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.RoleController.Delete(id).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-		#endregion
-	}
-}
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs
deleted file mode 100644
index 164bcbf..0000000
--- a/src/DevHive.Tests/DevHive.Web.Tests/TechnologyController.Tests.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using AutoMapper;
-using DevHive.Common.Models.Misc;
-using DevHive.Services.Interfaces;
-using DevHive.Services.Models.Technology;
-using DevHive.Web.Controllers;
-using DevHive.Web.Models.Technology;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace DevHive.Web.Tests
-{
-	[TestFixture]
-	public class TechnologyControllerTests
-	{
-		const string NAME = "Gosho Trapov";
-		private Mock<ITechnologyService> TechnologyServiceMock { get; set; }
-		private Mock<IMapper> MapperMock { get; set; }
-		private TechnologyController TechnologyController { get; set; }
-
-		#region SetUp
-		[SetUp]
-		public void SetUp()
-		{
-			this.TechnologyServiceMock = new Mock<ITechnologyService>();
-			this.MapperMock = new Mock<IMapper>();
-			this.TechnologyController = new TechnologyController(this.TechnologyServiceMock.Object, this.MapperMock.Object);
-		}
-		#endregion
-
-		#region Create
-		[Test]
-		public void Create_ReturnsOkObjectResult_WhenTechnologyIsSuccessfullyCreated()
-		{
-			CreateTechnologyWebModel createTechnologyWebModel = new CreateTechnologyWebModel
-			{
-				Name = NAME
-			};
-			CreateTechnologyServiceModel createTechnologyServiceModel = new CreateTechnologyServiceModel
-			{
-				Name = NAME
-			};
-			Guid id = Guid.NewGuid();
-
-			this.MapperMock.Setup(p => p.Map<CreateTechnologyServiceModel>(It.IsAny<CreateTechnologyWebModel>())).Returns(createTechnologyServiceModel);
-			this.TechnologyServiceMock.Setup(p => p.CreateTechnology(It.IsAny<CreateTechnologyServiceModel>())).Returns(Task.FromResult(id));
-
-			IActionResult result = this.TechnologyController.Create(createTechnologyWebModel).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			var splitted = (result as OkObjectResult).Value
-				.ToString()
-				.Split('{', '}', '=', ' ')
-				.Where(x => !string.IsNullOrEmpty(x))
-				.ToArray();
-
-			Guid resultId = Guid.Parse(splitted[1]);
-
-			Assert.AreEqual(id, resultId);
-		}
-
-		[Test]
-		public void Create_ReturnsBadRequestObjectResult_WhenTechnologyIsNotCreatedSuccessfully()
-		{
-			CreateTechnologyWebModel createTechnologyWebModel = new CreateTechnologyWebModel
-			{
-				Name = NAME
-			};
-			CreateTechnologyServiceModel createTechnologyServiceModel = new CreateTechnologyServiceModel
-			{
-				Name = NAME
-			};
-			Guid id = Guid.Empty;
-			string errorMessage = $"Could not create technology {NAME}";
-
-			this.MapperMock.Setup(p => p.Map<CreateTechnologyServiceModel>(It.IsAny<CreateTechnologyWebModel>())).Returns(createTechnologyServiceModel);
-			this.TechnologyServiceMock.Setup(p => p.CreateTechnology(It.IsAny<CreateTechnologyServiceModel>())).Returns(Task.FromResult(id));
-
-			IActionResult result = this.TechnologyController.Create(createTechnologyWebModel).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequsetObjectResult = result as BadRequestObjectResult;
-			string resultMessage = badRequsetObjectResult.Value.ToString();
-
-			Assert.AreEqual(errorMessage, resultMessage);
-		}
-		#endregion
-
-		#region Read
-		[Test]
-		public void GetById_ReturnsTheThecnology_WhenItExists()
-		{
-			Guid id = Guid.NewGuid();
-
-			ReadTechnologyWebModel readTechnologyWebModel = new ReadTechnologyWebModel
-			{
-				Name = NAME
-			};
-			ReadTechnologyServiceModel readTechnologyServiceModel = new ReadTechnologyServiceModel
-			{
-				Name = NAME
-			};
-
-			this.TechnologyServiceMock.Setup(p => p.GetTechnologyById(It.IsAny<Guid>())).Returns(Task.FromResult(readTechnologyServiceModel));
-			this.MapperMock.Setup(p => p.Map<ReadTechnologyWebModel>(It.IsAny<ReadTechnologyServiceModel>())).Returns(readTechnologyWebModel);
-
-			IActionResult result = this.TechnologyController.GetById(id).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			OkObjectResult okObjectResult = result as OkObjectResult;
-			ReadTechnologyWebModel resultModel = okObjectResult.Value as Models.Technology.ReadTechnologyWebModel;
-
-			Assert.AreEqual(NAME, resultModel.Name);
-		}
-		#endregion
-
-		#region Update
-		[Test]
-		public void Update_ShouldReturnOkResult_WhenTechnologyIsUpdatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			UpdateTechnologyWebModel updateTechnologyWebModel = new UpdateTechnologyWebModel
-			{
-				Name = NAME
-			};
-			UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel
-			{
-				Name = NAME
-			};
-
-			this.TechnologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>())).Returns(Task.FromResult(true));
-			this.MapperMock.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>())).Returns(updateTechnologyServiceModel);
-
-			IActionResult result = this.TechnologyController.Update(id, updateTechnologyWebModel).Result;
-
-			Assert.IsInstanceOf<OkResult>(result);
-		}
-
-		[Test]
-		public void Update_ShouldReturnBadObjectResult_WhenTechnologyIsNotUpdatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			string message = "Could not update Technology";
-			UpdateTechnologyWebModel updateTechnologyWebModel = new UpdateTechnologyWebModel
-			{
-				Name = NAME
-			};
-			UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel
-			{
-				Name = NAME
-			};
-
-			this.TechnologyServiceMock.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>())).Returns(Task.FromResult(false));
-			this.MapperMock.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>())).Returns(updateTechnologyServiceModel);
-
-			IActionResult result = this.TechnologyController.Update(id, updateTechnologyWebModel).Result;
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-		#endregion
-
-		#region Delete
-		[Test]
-		public void Delete_ReturnsOkResult_WhenTechnologyIsDeletedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-
-			this.TechnologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny<Guid>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.TechnologyController.Delete(id).Result;
-
-			Assert.IsInstanceOf<OkResult>(result);
-		}
-
-		[Test]
-		public void Delet_ReturnsBadRequestObjectResult_WhenTechnologyIsNotDeletedSuccessfully()
-		{
-			string message = "Could not delete Technology";
-			Guid id = Guid.NewGuid();
-
-			this.TechnologyServiceMock.Setup(p => p.DeleteTechnology(It.IsAny<Guid>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.TechnologyController.Delete(id).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-		#endregion
-	}
-}
diff --git a/src/DevHive.Tests/DevHive.Web.Tests/UserController.Tests.cs b/src/DevHive.Tests/DevHive.Web.Tests/UserController.Tests.cs
deleted file mode 100644
index c1431c8..0000000
--- a/src/DevHive.Tests/DevHive.Web.Tests/UserController.Tests.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using AutoMapper;
-using DevHive.Common.Models.Identity;
-using DevHive.Services.Interfaces;
-using DevHive.Services.Models.Identity.User;
-using DevHive.Web.Controllers;
-using DevHive.Web.Models.Identity.User;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using NUnit.Framework;
-
-namespace DevHive.Web.Tests
-{
-    [TestFixture]
-	public class UserControllerTests
-	{
-		const string USERNAME = "Gosho Trapov";
-		private Mock<IUserService> UserServiceMock { get; set; }
-		private Mock<IMapper> MapperMock { get; set; }
-		private UserController UserController { get; set; }
-
-		[SetUp]
-		public void SetUp()
-		{
-			this.UserServiceMock = new Mock<IUserService>();
-			this.MapperMock = new Mock<IMapper>();
-			this.UserController = new UserController(this.UserServiceMock.Object, this.MapperMock.Object);
-		}
-
-		#region Create
-		[Test]
-		public void LoginUser_ReturnsOkObjectResult_WhenUserIsSuccessfullyLoggedIn()
-		{
-			Guid id = Guid.NewGuid();
-			LoginWebModel loginWebModel = new LoginWebModel
-			{
-				UserName = USERNAME
-			};
-			LoginServiceModel loginServiceModel = new LoginServiceModel
-			{
-				UserName = USERNAME
-			};
-			string token = "goshotrapov";
-			TokenModel tokenModel = new TokenModel(token);
-			TokenWebModel tokenWebModel = new TokenWebModel(token);
-
-			this.MapperMock.Setup(p => p.Map<LoginServiceModel>(It.IsAny<LoginWebModel>())).Returns(loginServiceModel);
-			this.MapperMock.Setup(p => p.Map<TokenWebModel>(It.IsAny<TokenModel>())).Returns(tokenWebModel);
-			this.UserServiceMock.Setup(p => p.LoginUser(It.IsAny<LoginServiceModel>())).Returns(Task.FromResult(tokenModel));
-
-			IActionResult result = this.UserController.Login(loginWebModel).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			var resultToken = ((result as OkObjectResult).Value as TokenWebModel).Token;
-
-			Assert.AreEqual(token, resultToken);
-		}
-
-		[Test]
-		public void RegisterUser_ReturnsOkObjectResult_WhenUserIsSuccessfullyRegistered()
-		{
-			Guid id = Guid.NewGuid();
-			RegisterWebModel registerWebModel = new RegisterWebModel
-			{
-				UserName = USERNAME
-			};
-			RegisterServiceModel registerServiceModel = new RegisterServiceModel
-			{
-				UserName = USERNAME
-			};
-			string token = "goshotrapov";
-			TokenModel tokenModel = new TokenModel(token);
-			TokenWebModel tokenWebModel = new TokenWebModel(token);
-
-			this.MapperMock.Setup(p => p.Map<RegisterServiceModel>(It.IsAny<RegisterWebModel>())).Returns(registerServiceModel);
-			this.MapperMock.Setup(p => p.Map<TokenWebModel>(It.IsAny<TokenModel>())).Returns(tokenWebModel);
-			this.UserServiceMock.Setup(p => p.RegisterUser(It.IsAny<RegisterServiceModel>())).Returns(Task.FromResult(tokenModel));
-
-			IActionResult result = this.UserController.Register(registerWebModel).Result;
-
-			Assert.IsInstanceOf<CreatedResult>(result);
-
-			CreatedResult createdResult = result as CreatedResult;
-			TokenWebModel resultModel = (createdResult.Value as TokenWebModel);
-
-			Assert.AreEqual(token, resultModel.Token);
-		}
-		#endregion
-
-		#region Read
-		[Test]
-		public void GetById_ReturnsTheUser_WhenItExists()
-		{
-			Guid id = Guid.NewGuid();
-
-			UserServiceModel userServiceModel = new UserServiceModel
-			{
-				UserName = USERNAME
-			};
-			UserWebModel userWebModel = new UserWebModel
-			{
-				UserName = USERNAME
-			};
-
-			this.UserServiceMock.Setup(p => p.GetUserById(It.IsAny<Guid>())).Returns(Task.FromResult(userServiceModel));
-			this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-			this.MapperMock.Setup(p => p.Map<UserWebModel>(It.IsAny<UserServiceModel>())).Returns(userWebModel);
-
-			IActionResult result = this.UserController.GetById(id, null).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			OkObjectResult okObjectResult = result as OkObjectResult;
-			UserWebModel resultModel = okObjectResult.Value as Models.Identity.User.UserWebModel;
-
-			Assert.AreEqual(USERNAME, resultModel.UserName);
-		}
-
-		[Test]
-		public void GetById_ReturnsUnauthorizedResult_WhenUserIsNotAuthorized()
-		{
-			Guid id = Guid.NewGuid();
-			UserWebModel userWebModel = new UserWebModel
-			{
-				UserName = USERNAME
-			};
-
-			this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.UserController.GetById(Guid.NewGuid(), null).Result;
-
-			Assert.IsInstanceOf<UnauthorizedResult>(result);
-		}
-
-		[Test]
-		public void GetUser_ReturnsTheUser_WhenItExists()
-		{
-			Guid id = Guid.NewGuid();
-			UserWebModel userWebModel = new UserWebModel
-			{
-				UserName = USERNAME
-			};
-			UserServiceModel userServiceModel = new UserServiceModel
-			{
-				UserName = USERNAME
-			};
-
-			this.UserServiceMock.Setup(p => p.GetUserByUsername(It.IsAny<string>())).Returns(Task.FromResult(userServiceModel));
-			this.MapperMock.Setup(p => p.Map<UserWebModel>(It.IsAny<UserServiceModel>())).Returns(userWebModel);
-
-			IActionResult result = this.UserController.GetUser(null).Result;
-
-			Assert.IsInstanceOf<OkObjectResult>(result);
-
-			OkObjectResult okObjectResult = result as OkObjectResult;
-			UserWebModel resultModel = okObjectResult.Value as Models.Identity.User.UserWebModel;
-
-			Assert.AreEqual(USERNAME, resultModel.UserName);
-		}
-		#endregion
-
-		#region Update
-		[Test]
-		public void Update_ShouldReturnOkResult_WhenUserIsUpdatedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-			UpdateUserWebModel updateUserWebModel = new UpdateUserWebModel
-			{
-				UserName = USERNAME
-			};
-			UpdateUserServiceModel updateUserServiceModel = new UpdateUserServiceModel
-			{
-				UserName = USERNAME
-			};
-			UserServiceModel userServiceModel = new UserServiceModel
-			{
-				UserName = USERNAME
-			};
-
-			this.UserServiceMock.Setup(p => p.UpdateUser(It.IsAny<UpdateUserServiceModel>())).Returns(Task.FromResult(userServiceModel));
-			this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-			this.MapperMock.Setup(p => p.Map<UpdateUserServiceModel>(It.IsAny<UpdateUserWebModel>())).Returns(updateUserServiceModel);
-
-			IActionResult result = this.UserController.Update(id, updateUserWebModel, null).Result;
-
-			Assert.IsInstanceOf<AcceptedResult>(result);
-		}
-
-		[Test]
-		public void UpdateProfilePicture_ShouldReturnOkObjectResult_WhenProfilePictureIsUpdatedSuccessfully()
-		{
-			string profilePictureURL = "goshotrapov";
-			UpdateProfilePictureWebModel updateProfilePictureWebModel = new UpdateProfilePictureWebModel();
-			UpdateProfilePictureServiceModel updateProfilePictureServiceModel = new UpdateProfilePictureServiceModel();
-			ProfilePictureServiceModel profilePictureServiceModel = new ProfilePictureServiceModel
-			{
-				ProfilePictureURL = profilePictureURL
-			};
-			ProfilePictureWebModel profilePictureWebModel = new ProfilePictureWebModel
-			{
-				ProfilePictureURL = profilePictureURL
-			};
-
-			this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-			this.MapperMock.Setup(p => p.Map<UpdateProfilePictureServiceModel>(It.IsAny<UpdateProfilePictureWebModel>())).Returns(updateProfilePictureServiceModel);
-			this.UserServiceMock.Setup(p => p.UpdateProfilePicture(It.IsAny<UpdateProfilePictureServiceModel>())).Returns(Task.FromResult(profilePictureServiceModel));
-			this.MapperMock.Setup(p => p.Map<ProfilePictureWebModel>(It.IsAny<ProfilePictureServiceModel>())).Returns(profilePictureWebModel);
-
-
-			IActionResult result = this.UserController.UpdateProfilePicture(Guid.Empty, updateProfilePictureWebModel, null).Result;
-
-			Assert.IsInstanceOf<AcceptedResult>(result);
-
-			AcceptedResult acceptedResult = result as AcceptedResult;
-			ProfilePictureWebModel resultModel = acceptedResult.Value as Models.Identity.User.ProfilePictureWebModel;
-
-			Assert.AreEqual(profilePictureURL, resultModel.ProfilePictureURL);
-		}
-		#endregion
-
-		#region Delete
-		[Test]
-		public void Delete_ReturnsOkResult_WhenUserIsDeletedSuccessfully()
-		{
-			Guid id = Guid.NewGuid();
-
-			this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-			this.UserServiceMock.Setup(p => p.DeleteUser(It.IsAny<Guid>())).Returns(Task.FromResult(true));
-
-			IActionResult result = this.UserController.Delete(id, null).Result;
-
-			Assert.IsInstanceOf<OkResult>(result);
-		}
-
-		[Test]
-		public void Delete_ReturnsBadRequestObjectResult_WhenUserIsNotDeletedSuccessfully()
-		{
-			string message = "Could not delete User";
-			Guid id = Guid.NewGuid();
-
-			this.UserServiceMock.Setup(p => p.ValidJWT(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(true));
-			this.UserServiceMock.Setup(p => p.DeleteUser(It.IsAny<Guid>())).Returns(Task.FromResult(false));
-
-			IActionResult result = this.UserController.Delete(id, null).Result;
-
-			Assert.IsInstanceOf<BadRequestObjectResult>(result);
-
-			BadRequestObjectResult badRequestObjectResult = result as BadRequestObjectResult;
-			string resultModel = badRequestObjectResult.Value.ToString();
-
-			Assert.AreEqual(message, resultModel);
-		}
-		#endregion
-	}
-}