7 files changed, 50 insertions, 2 deletions
diff --git a/BackEnd/Timeline.Tests/IntegratedTests/BookmarkTimelineTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/BookmarkTimelineTest.cs
index 4bad700b..eb3e878d 100644
--- a/BackEnd/Timeline.Tests/IntegratedTests/BookmarkTimelineTest.cs
+++ b/BackEnd/Timeline.Tests/IntegratedTests/BookmarkTimelineTest.cs
@@ -1,4 +1,5 @@
 using FluentAssertions;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Timeline.Models.Http;
@@ -7,6 +8,7 @@ using Xunit.Abstractions;
 
 namespace Timeline.Tests.IntegratedTests
 {
+    [Obsolete("Old test.")]
     public class BookmarkTimelineTest : IntegratedTestBase
     {
         public BookmarkTimelineTest(ITestOutputHelper testOutputHelper) : base(testOutputHelper)
diff --git a/BackEnd/Timeline.Tests/IntegratedTests/HighlightTimelineTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/HighlightTimelineTest.cs
index c52ac907..f05497fd 100644
--- a/BackEnd/Timeline.Tests/IntegratedTests/HighlightTimelineTest.cs
+++ b/BackEnd/Timeline.Tests/IntegratedTests/HighlightTimelineTest.cs
@@ -1,4 +1,5 @@
 using FluentAssertions;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Timeline.Models.Http;
@@ -7,6 +8,7 @@ using Xunit.Abstractions;
 
 namespace Timeline.Tests.IntegratedTests
 {
+    [Obsolete("Old test.")]
     public class HighlightTimelineTest : IntegratedTestBase
     {
         public HighlightTimelineTest(ITestOutputHelper testOutputHelper) : base(testOutputHelper)
diff --git a/BackEnd/Timeline.Tests/IntegratedTests/SearchTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/SearchTest.cs
index 499eabbe..c9d1cb58 100644
--- a/BackEnd/Timeline.Tests/IntegratedTests/SearchTest.cs
+++ b/BackEnd/Timeline.Tests/IntegratedTests/SearchTest.cs
@@ -1,4 +1,5 @@
 using FluentAssertions;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Timeline.Models.Http;
@@ -7,6 +8,7 @@ using Xunit.Abstractions;
 
 namespace Timeline.Tests.IntegratedTests
 {
+    [Obsolete("Old test.")]
     public class SearchTest : IntegratedTestBase
     {
         public SearchTest(ITestOutputHelper testOutputHelper) : base(testOutputHelper)
diff --git a/BackEnd/Timeline.Tests/IntegratedTests/TimelineTest.cs b/BackEnd/Timeline.Tests/IntegratedTests/TimelineTest.cs
index 5fab2bdb..4abcdb92 100644
--- a/BackEnd/Timeline.Tests/IntegratedTests/TimelineTest.cs
+++ b/BackEnd/Timeline.Tests/IntegratedTests/TimelineTest.cs
@@ -10,6 +10,7 @@ using Xunit.Abstractions;
 
 namespace Timeline.Tests.IntegratedTests
 {
+    [Obsolete("Old test.")]
     public class TimelineTest : BaseTimelineTest
     {
         public TimelineTest(ITestOutputHelper testOutputHelper) : base(testOutputHelper)
diff --git a/BackEnd/Timeline.Tests/IntegratedTests2/SelfTest.cs b/BackEnd/Timeline.Tests/IntegratedTests2/SelfTest.cs
new file mode 100644
index 00000000..9698551a
--- /dev/null
+++ b/BackEnd/Timeline.Tests/IntegratedTests2/SelfTest.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Timeline.Models.Http;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Timeline.Tests.IntegratedTests2
+{
+    public class SelfTest : IntegratedTestBase
+    {
+        public SelfTest(ITestOutputHelper testOutput) : base(testOutput)
+        {
+        }
+
+        [Fact]
+        public async Task ChangePassword()
+        {
+            await DefaultClient.TestJsonSendAsync(HttpMethod.Post, "v2/self/changepassword", new HttpChangePasswordRequest
+            {
+                OldPassword = "abc",
+                NewPassword = "def"
+            }, expectedStatusCode: HttpStatusCode.Unauthorized);
+
+
+            await UserClient.TestJsonSendAsync(HttpMethod.Post, "v2/self/changepassword", new HttpChangePasswordRequest
+            {
+                OldPassword = "abc",
+                NewPassword = "def"
+            }, expectedStatusCode: HttpStatusCode.UnprocessableEntity);
+
+            await UserClient.TestJsonSendAsync(HttpMethod.Post, "v2/self/changepassword", new HttpChangePasswordRequest
+            {
+                OldPassword = "userpw",
+                NewPassword = "def"
+            }, expectedStatusCode: HttpStatusCode.NoContent);
+        }
+    }
+}
+
diff --git a/BackEnd/Timeline.Tests/IntegratedTests2/TimelineTest.cs b/BackEnd/Timeline.Tests/IntegratedTests2/TimelineTest.cs
index 807314f4..84bd5264 100644
--- a/BackEnd/Timeline.Tests/IntegratedTests2/TimelineTest.cs
+++ b/BackEnd/Timeline.Tests/IntegratedTests2/TimelineTest.cs
@@ -25,7 +25,7 @@ namespace Timeline.Tests.IntegratedTests2
 
             var b = await client.TestJsonSendAsync<HttpTimeline>(HttpMethod.Get, "v2/timelines/user/hello");
 
-            a.Name.Should().Be(b.Name);
+            a.NameV2.Should().Be(b.NameV2);
             a.UniqueId.Should().Be(b.UniqueId);
         }
 
diff --git a/BackEnd/Timeline.Tests/IntegratedTests2/TimelineTest2.cs b/BackEnd/Timeline.Tests/IntegratedTests2/TimelineTest2.cs
index b5566ba0..a97ee6d6 100644
--- a/BackEnd/Timeline.Tests/IntegratedTests2/TimelineTest2.cs
+++ b/BackEnd/Timeline.Tests/IntegratedTests2/TimelineTest2.cs
@@ -38,7 +38,7 @@ namespace Timeline.Tests.IntegratedTests2
                 Color = "#FFFFFF"
             });
 
-            b.Name.Should().Be("hello2");
+            b.NameV2.Should().Be("hello2");
             b.Title.Should().Be("Hello");
             b.Description.Should().Be("A Description.");
             b.Visibility.Should().Be(TimelineVisibility.Public);