diff --git a/src/.cr/personal/Options/StorageStreams.xml b/src/.cr/personal/Options/StorageStreams.xml
new file mode 100644
index 0000000..c728484
--- /dev/null
+++ b/src/.cr/personal/Options/StorageStreams.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Root Type="DevExpress.CodeRush.Platform.Options.StorageStreamOptions">
+  <Options Language="Neutral">
+    <Streams />
+  </Options>
+</Root>
\ No newline at end of file
diff --git a/src/.cr/team/Options/StorageStreams.xml b/src/.cr/team/Options/StorageStreams.xml
new file mode 100644
index 0000000..c728484
--- /dev/null
+++ b/src/.cr/team/Options/StorageStreams.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Root Type="DevExpress.CodeRush.Platform.Options.StorageStreamOptions">
+  <Options Language="Neutral">
+    <Streams />
+  </Options>
+</Root>
\ No newline at end of file
diff --git a/src/Tests/CodeAnalysisTest/OrganizeMembersTest.cs b/src/Tests/CodeAnalysisTest/OrganizeMembersTest.cs
index 3bf7cca..ac4629c 100644
--- a/src/Tests/CodeAnalysisTest/OrganizeMembersTest.cs
+++ b/src/Tests/CodeAnalysisTest/OrganizeMembersTest.cs
@@ -87,7 +87,12 @@ public string StrProp
     static OrganizeMembersTest()
     {
         PublicStaticMehtod();
-        PrivateStaticMehtod("Hello");
+
+        var hello = "Hello";
+        PrivateStaticMehtod(hello);
+
+        PublicStaticProp = hello;
+        PrivateStaticProp = hello;
     }
 
     private OrganizeMembersTest()
@@ -128,6 +133,17 @@ protected OrganizeMembersTest(string paramName) : this()
     // one line comment
     private const int Const1 = 140;
 
+    private static string InnerProp;
+
+    public static string PublicStaticProp
+    {
+        get => InnerProp;
+        [MemberNotNull(nameof(InnerProp))]
+        set => InnerProp = value;
+    }
+
+    private static string PrivateStaticProp { get; set; }
+
     /// <inheritdoc />
     public Task TaskMethodAsync(CancellationToken cancellationToken)
     {