diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/MongoDb/MongoDbQueryTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/MongoDb/MongoDbQueryTests.cs
index 759556d11..b19c1bb51 100644
--- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/MongoDb/MongoDbQueryTests.cs
+++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/MongoDb/MongoDbQueryTests.cs
@@ -181,7 +181,8 @@ namespace Squidex.Domain.Apps.Entities.Assets.MongoDb
 
             cursor.AssetTake(query.AdjustToModel());
 
-            A.CallTo(() => cursor.Limit(3)).MustHaveHappened();
+            A.CallTo(() => cursor.Limit(3))
+                .MustHaveHappened();
         }
 
         [Fact]
@@ -192,7 +193,8 @@ namespace Squidex.Domain.Apps.Entities.Assets.MongoDb
 
             cursor.AssetSkip(query.AdjustToModel());
 
-            A.CallTo(() => cursor.Skip(3)).MustHaveHappened();
+            A.CallTo(() => cursor.Skip(3))
+                .MustHaveHappened();
         }
 
         private static string C(string value)
diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/MongoDbQueryTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/MongoDbQueryTests.cs
index 022983bea..3b4056167 100644
--- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/MongoDbQueryTests.cs
+++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/MongoDbQueryTests.cs
@@ -222,7 +222,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.MongoDb
 
             cursor.ContentTake(query.AdjustToModel(schemaDef, false));
 
-            A.CallTo(() => cursor.Limit(3)).MustHaveHappened();
+            A.CallTo(() => cursor.Limit(3))
+                .MustHaveHappened();
         }
 
         [Fact]
@@ -233,7 +234,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.MongoDb
 
             cursor.ContentSkip(query.AdjustToModel(schemaDef, false));
 
-            A.CallTo(() => cursor.Skip(3)).MustHaveHappened();
+            A.CallTo(() => cursor.Skip(3))
+                .MustHaveHappened();
         }
 
         private static string C(string value)
diff --git a/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs b/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs
index 939b1b6fe..1b2db1e98 100644
--- a/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs
+++ b/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs
@@ -22,9 +22,12 @@ namespace Squidex.Domain.Users
         private readonly IAssetStore assetStore = A.Fake<IAssetStore>();
         private readonly AssetUserPictureStore sut;
         private readonly string userId = Guid.NewGuid().ToString();
+        private readonly string file;
 
         public AssetUserPictureStoreTests()
         {
+            file = AssetStoreExtensions.GetFileName(userId, 0, "picture");
+
             sut = new AssetUserPictureStore(assetStore);
         }
 
@@ -35,16 +38,17 @@ namespace Squidex.Domain.Users
 
             await sut.UploadAsync(userId, stream);
 
-            A.CallTo(() => assetStore.UploadAsync(userId, 0, "picture", stream, false, CancellationToken.None)).MustHaveHappened();
+            A.CallTo(() => assetStore.UploadAsync(file, stream, false, CancellationToken.None))
+                .MustHaveHappened();
         }
 
         [Fact]
         public async Task Should_invoke_asset_store_to_download_picture()
         {
-            A.CallTo(() => assetStore.DownloadAsync(userId, 0, "picture", A<Stream>.Ignored, CancellationToken.None))
+            A.CallTo(() => assetStore.DownloadAsync(file, A<Stream>.Ignored, CancellationToken.None))
                 .Invokes(async call =>
                 {
-                    var stream = call.GetArgument<Stream>(3);
+                    var stream = call.GetArgument<Stream>(1);
 
                     await stream.WriteAsync(new byte[] { 1, 2, 3, 4 }, 0, 4);
                 });
@@ -54,7 +58,8 @@ namespace Squidex.Domain.Users
             Assert.Equal(0, result.Position);
             Assert.Equal(4, result.Length);
 
-            A.CallTo(() => assetStore.DownloadAsync(userId, 0, "picture", A<Stream>.Ignored, CancellationToken.None)).MustHaveHappened();
+            A.CallTo(() => assetStore.DownloadAsync(file, A<Stream>.Ignored, CancellationToken.None))
+                .MustHaveHappened();
         }
     }
 }
diff --git a/tests/Squidex.Infrastructure.Tests/Caching/InvalidatingMemoryCacheTests.cs b/tests/Squidex.Infrastructure.Tests/Caching/InvalidatingMemoryCacheTests.cs
index beb3cd1d2..07b76876b 100644
--- a/tests/Squidex.Infrastructure.Tests/Caching/InvalidatingMemoryCacheTests.cs
+++ b/tests/Squidex.Infrastructure.Tests/Caching/InvalidatingMemoryCacheTests.cs
@@ -44,7 +44,8 @@ namespace Squidex.Infrastructure.Caching
         {
             sut.Dispose();
 
-            A.CallTo(() => cache.Dispose()).MustHaveHappened();
+            A.CallTo(() => cache.Dispose())
+                .MustHaveHappened();
         }
 
         [Fact]
@@ -52,7 +53,8 @@ namespace Squidex.Infrastructure.Caching
         {
             sut.Remove("a-key");
 
-            A.CallTo(() => cache.Remove("a-key")).MustHaveHappened();
+            A.CallTo(() => cache.Remove("a-key"))
+                .MustHaveHappened();
         }
 
         [Fact]
@@ -60,7 +62,8 @@ namespace Squidex.Infrastructure.Caching
         {
             sut.Invalidate(123);
 
-            A.CallTo(() => pubsub.Publish(A<InvalidateMessage>.That.Matches(x => x.CacheKey == "a-key"), true)).MustNotHaveHappened();
+            A.CallTo(() => pubsub.Publish(A<InvalidateMessage>.That.Matches(x => x.CacheKey == "a-key"), true))
+                .MustNotHaveHappened();
         }
 
         [Fact]
@@ -68,7 +71,8 @@ namespace Squidex.Infrastructure.Caching
         {
             sut.Invalidate("a-key");
 
-            A.CallTo(() => pubsub.Publish(A<InvalidateMessage>.That.Matches(x => x.CacheKey == "a-key"), true)).MustHaveHappened();
+            A.CallTo(() => pubsub.Publish(A<InvalidateMessage>.That.Matches(x => x.CacheKey == "a-key"), true))
+                .MustHaveHappened();
         }
 
         [Fact]
@@ -76,7 +80,8 @@ namespace Squidex.Infrastructure.Caching
         {
             ((IMemoryCache)sut).Invalidate("a-key");
 
-            A.CallTo(() => pubsub.Publish(A<InvalidateMessage>.That.Matches(x => x.CacheKey == "a-key"), true)).MustHaveHappened();
+            A.CallTo(() => pubsub.Publish(A<InvalidateMessage>.That.Matches(x => x.CacheKey == "a-key"), true))
+                .MustHaveHappened();
         }
 
         [Fact]