diff --git a/src/androidTest/assets/split_changes_flag_set-0.json b/src/androidTest/assets/split_changes_flag_set-0.json
index b3c0556d1..93be5fda4 100644
--- a/src/androidTest/assets/split_changes_flag_set-0.json
+++ b/src/androidTest/assets/split_changes_flag_set-0.json
@@ -1,108 +1 @@
-{
-  "splits": [
-    {
-      "trafficTypeName": "client",
-      "name": "workm",
-      "trafficAllocation": 100,
-      "trafficAllocationSeed": 147392224,
-      "seed": 524417105,
-      "status": "ACTIVE",
-      "killed": false,
-      "defaultTreatment": "on",
-      "changeNumber": 1602798638344,
-      "algo": 2,
-      "configurations": {},
-      "sets": ["set_3"],
-      "conditions": [
-        {
-          "conditionType": "ROLLOUT",
-          "matcherGroup": {
-            "combiner": "AND",
-            "matchers": [
-              {
-                "keySelector": {
-                  "trafficType": "client",
-                  "attribute": null
-                },
-                "matcherType": "IN_SEGMENT",
-                "negate": false,
-                "userDefinedSegmentMatcherData": {
-                  "segmentName": "new_segment"
-                },
-                "whitelistMatcherData": null,
-                "unaryNumericMatcherData": null,
-                "betweenMatcherData": null,
-                "booleanMatcherData": null,
-                "dependencyMatcherData": null,
-                "stringMatcherData": null
-              }
-            ]
-          },
-          "partitions": [
-            {
-              "treatment": "on",
-              "size": 0
-            },
-            {
-              "treatment": "off",
-              "size": 0
-            },
-            {
-              "treatment": "free",
-              "size": 100
-            },
-            {
-              "treatment": "conta",
-              "size": 0
-            }
-          ],
-          "label": "in segment new_segment"
-        },
-        {
-          "conditionType": "ROLLOUT",
-          "matcherGroup": {
-            "combiner": "AND",
-            "matchers": [
-              {
-                "keySelector": {
-                  "trafficType": "client",
-                  "attribute": null
-                },
-                "matcherType": "ALL_KEYS",
-                "negate": false,
-                "userDefinedSegmentMatcherData": null,
-                "whitelistMatcherData": null,
-                "unaryNumericMatcherData": null,
-                "betweenMatcherData": null,
-                "booleanMatcherData": null,
-                "dependencyMatcherData": null,
-                "stringMatcherData": null
-              }
-            ]
-          },
-          "partitions": [
-            {
-              "treatment": "on",
-              "size": 100
-            },
-            {
-              "treatment": "off",
-              "size": 0
-            },
-            {
-              "treatment": "free",
-              "size": 0
-            },
-            {
-              "treatment": "conta",
-              "size": 0
-            }
-          ],
-          "label": "default rule"
-        }
-      ]
-    }
-  ],
-  "since": 1602797638344,
-  "till": 1602798638344
-}
+{"splits":[{"trafficTypeName":"client","name":"workm","trafficAllocation":100,"trafficAllocationSeed":147392224,"seed":524417105,"status":"ACTIVE","killed":false,"defaultTreatment":"on","changeNumber":1602798638344,"algo":2,"configurations":{},"sets":["set_3"],"conditions":[{"conditionType":"ROLLOUT","matcherGroup":{"combiner":"AND","matchers":[{"keySelector":{"trafficType":"client","attribute":null},"matcherType":"IN_SEGMENT","negate":false,"userDefinedSegmentMatcherData":{"segmentName":"new_segment"},"whitelistMatcherData":null,"unaryNumericMatcherData":null,"betweenMatcherData":null,"booleanMatcherData":null,"dependencyMatcherData":null,"stringMatcherData":null}]},"partitions":[{"treatment":"on","size":0},{"treatment":"off","size":0},{"treatment":"free","size":100},{"treatment":"conta","size":0}],"label":"in segment new_segment"},{"conditionType":"ROLLOUT","matcherGroup":{"combiner":"AND","matchers":[{"keySelector":{"trafficType":"client","attribute":null},"matcherType":"ALL_KEYS","negate":false,"userDefinedSegmentMatcherData":null,"whitelistMatcherData":null,"unaryNumericMatcherData":null,"betweenMatcherData":null,"booleanMatcherData":null,"dependencyMatcherData":null,"stringMatcherData":null}]},"partitions":[{"treatment":"on","size":100},{"treatment":"off","size":0},{"treatment":"free","size":0},{"treatment":"conta","size":0}],"label":"default rule"}]}],"since":1602797638344,"till":1602798638344}
diff --git a/src/androidTest/assets/split_changes_flag_set-1.json b/src/androidTest/assets/split_changes_flag_set-1.json
index 6ed91ced6..67f617712 100644
--- a/src/androidTest/assets/split_changes_flag_set-1.json
+++ b/src/androidTest/assets/split_changes_flag_set-1.json
@@ -1,108 +1 @@
-{
-  "splits": [
-    {
-      "trafficTypeName": "client",
-      "name": "workm",
-      "trafficAllocation": 100,
-      "trafficAllocationSeed": 147392224,
-      "seed": 524417105,
-      "status": "ACTIVE",
-      "killed": false,
-      "defaultTreatment": "on",
-      "changeNumber": 1602797638344,
-      "algo": 2,
-      "configurations": {},
-      "sets": ["set_1"],
-      "conditions": [
-        {
-          "conditionType": "ROLLOUT",
-          "matcherGroup": {
-            "combiner": "AND",
-            "matchers": [
-              {
-                "keySelector": {
-                  "trafficType": "client",
-                  "attribute": null
-                },
-                "matcherType": "IN_SEGMENT",
-                "negate": false,
-                "userDefinedSegmentMatcherData": {
-                  "segmentName": "new_segment"
-                },
-                "whitelistMatcherData": null,
-                "unaryNumericMatcherData": null,
-                "betweenMatcherData": null,
-                "booleanMatcherData": null,
-                "dependencyMatcherData": null,
-                "stringMatcherData": null
-              }
-            ]
-          },
-          "partitions": [
-            {
-              "treatment": "on",
-              "size": 0
-            },
-            {
-              "treatment": "off",
-              "size": 0
-            },
-            {
-              "treatment": "free",
-              "size": 100
-            },
-            {
-              "treatment": "conta",
-              "size": 0
-            }
-          ],
-          "label": "in segment new_segment"
-        },
-        {
-          "conditionType": "ROLLOUT",
-          "matcherGroup": {
-            "combiner": "AND",
-            "matchers": [
-              {
-                "keySelector": {
-                  "trafficType": "client",
-                  "attribute": null
-                },
-                "matcherType": "ALL_KEYS",
-                "negate": false,
-                "userDefinedSegmentMatcherData": null,
-                "whitelistMatcherData": null,
-                "unaryNumericMatcherData": null,
-                "betweenMatcherData": null,
-                "booleanMatcherData": null,
-                "dependencyMatcherData": null,
-                "stringMatcherData": null
-              }
-            ]
-          },
-          "partitions": [
-            {
-              "treatment": "on",
-              "size": 100
-            },
-            {
-              "treatment": "off",
-              "size": 0
-            },
-            {
-              "treatment": "free",
-              "size": 0
-            },
-            {
-              "treatment": "conta",
-              "size": 0
-            }
-          ],
-          "label": "default rule"
-        }
-      ]
-    }
-  ],
-  "since": 1602796638344,
-  "till": 1602797638344
-}
+{"splits":[{"trafficTypeName":"client","name":"workm","trafficAllocation":100,"trafficAllocationSeed":147392224,"seed":524417105,"status":"ACTIVE","killed":false,"defaultTreatment":"on","changeNumber":1602797638344,"algo":2,"configurations":{},"sets":["set_1"],"conditions":[{"conditionType":"ROLLOUT","matcherGroup":{"combiner":"AND","matchers":[{"keySelector":{"trafficType":"client","attribute":null},"matcherType":"IN_SEGMENT","negate":false,"userDefinedSegmentMatcherData":{"segmentName":"new_segment"},"whitelistMatcherData":null,"unaryNumericMatcherData":null,"betweenMatcherData":null,"booleanMatcherData":null,"dependencyMatcherData":null,"stringMatcherData":null}]},"partitions":[{"treatment":"on","size":0},{"treatment":"off","size":0},{"treatment":"free","size":100},{"treatment":"conta","size":0}],"label":"in segment new_segment"},{"conditionType":"ROLLOUT","matcherGroup":{"combiner":"AND","matchers":[{"keySelector":{"trafficType":"client","attribute":null},"matcherType":"ALL_KEYS","negate":false,"userDefinedSegmentMatcherData":null,"whitelistMatcherData":null,"unaryNumericMatcherData":null,"betweenMatcherData":null,"booleanMatcherData":null,"dependencyMatcherData":null,"stringMatcherData":null}]},"partitions":[{"treatment":"on","size":100},{"treatment":"off","size":0},{"treatment":"free","size":0},{"treatment":"conta","size":0}],"label":"default rule"}]}],"since":1602796638344,"till":1602797638344}
diff --git a/src/androidTest/assets/split_changes_flag_set-2.json b/src/androidTest/assets/split_changes_flag_set-2.json
index 2d28b7582..a96e3e209 100644
--- a/src/androidTest/assets/split_changes_flag_set-2.json
+++ b/src/androidTest/assets/split_changes_flag_set-2.json
@@ -1,210 +1 @@
-{
-  "splits": [
-    {
-      "trafficTypeName": "client",
-      "name": "workm",
-      "trafficAllocation": 100,
-      "trafficAllocationSeed": 147392224,
-      "seed": 524417105,
-      "status": "ACTIVE",
-      "killed": false,
-      "defaultTreatment": "on",
-      "changeNumber": 1602796638344,
-      "algo": 2,
-      "configurations": {},
-      "sets": ["set_1", "set_2"],
-      "conditions": [
-        {
-          "conditionType": "ROLLOUT",
-          "matcherGroup": {
-            "combiner": "AND",
-            "matchers": [
-              {
-                "keySelector": {
-                  "trafficType": "client",
-                  "attribute": null
-                },
-                "matcherType": "IN_SEGMENT",
-                "negate": false,
-                "userDefinedSegmentMatcherData": {
-                  "segmentName": "new_segment"
-                },
-                "whitelistMatcherData": null,
-                "unaryNumericMatcherData": null,
-                "betweenMatcherData": null,
-                "booleanMatcherData": null,
-                "dependencyMatcherData": null,
-                "stringMatcherData": null
-              }
-            ]
-          },
-          "partitions": [
-            {
-              "treatment": "on",
-              "size": 0
-            },
-            {
-              "treatment": "off",
-              "size": 0
-            },
-            {
-              "treatment": "free",
-              "size": 100
-            },
-            {
-              "treatment": "conta",
-              "size": 0
-            }
-          ],
-          "label": "in segment new_segment"
-        },
-        {
-          "conditionType": "ROLLOUT",
-          "matcherGroup": {
-            "combiner": "AND",
-            "matchers": [
-              {
-                "keySelector": {
-                  "trafficType": "client",
-                  "attribute": null
-                },
-                "matcherType": "ALL_KEYS",
-                "negate": false,
-                "userDefinedSegmentMatcherData": null,
-                "whitelistMatcherData": null,
-                "unaryNumericMatcherData": null,
-                "betweenMatcherData": null,
-                "booleanMatcherData": null,
-                "dependencyMatcherData": null,
-                "stringMatcherData": null
-              }
-            ]
-          },
-          "partitions": [
-            {
-              "treatment": "on",
-              "size": 100
-            },
-            {
-              "treatment": "off",
-              "size": 0
-            },
-            {
-              "treatment": "free",
-              "size": 0
-            },
-            {
-              "treatment": "conta",
-              "size": 0
-            }
-          ],
-          "label": "default rule"
-        }
-      ]
-    },
-    {
-      "trafficTypeName": "client",
-      "name": "workm_set_3",
-      "trafficAllocation": 100,
-      "trafficAllocationSeed": 147392224,
-      "seed": 524417105,
-      "status": "ACTIVE",
-      "killed": false,
-      "defaultTreatment": "on",
-      "changeNumber": 1602796638344,
-      "algo": 2,
-      "configurations": {},
-      "sets": ["set_3"],
-      "conditions": [
-        {
-          "conditionType": "ROLLOUT",
-          "matcherGroup": {
-            "combiner": "AND",
-            "matchers": [
-              {
-                "keySelector": {
-                  "trafficType": "client",
-                  "attribute": null
-                },
-                "matcherType": "IN_SEGMENT",
-                "negate": false,
-                "userDefinedSegmentMatcherData": {
-                  "segmentName": "new_segment"
-                },
-                "whitelistMatcherData": null,
-                "unaryNumericMatcherData": null,
-                "betweenMatcherData": null,
-                "booleanMatcherData": null,
-                "dependencyMatcherData": null,
-                "stringMatcherData": null
-              }
-            ]
-          },
-          "partitions": [
-            {
-              "treatment": "on",
-              "size": 0
-            },
-            {
-              "treatment": "off",
-              "size": 0
-            },
-            {
-              "treatment": "free",
-              "size": 100
-            },
-            {
-              "treatment": "conta",
-              "size": 0
-            }
-          ],
-          "label": "in segment new_segment"
-        },
-        {
-          "conditionType": "ROLLOUT",
-          "matcherGroup": {
-            "combiner": "AND",
-            "matchers": [
-              {
-                "keySelector": {
-                  "trafficType": "client",
-                  "attribute": null
-                },
-                "matcherType": "ALL_KEYS",
-                "negate": false,
-                "userDefinedSegmentMatcherData": null,
-                "whitelistMatcherData": null,
-                "unaryNumericMatcherData": null,
-                "betweenMatcherData": null,
-                "booleanMatcherData": null,
-                "dependencyMatcherData": null,
-                "stringMatcherData": null
-              }
-            ]
-          },
-          "partitions": [
-            {
-              "treatment": "on",
-              "size": 100
-            },
-            {
-              "treatment": "off",
-              "size": 0
-            },
-            {
-              "treatment": "free",
-              "size": 0
-            },
-            {
-              "treatment": "conta",
-              "size": 0
-            }
-          ],
-          "label": "default rule"
-        }
-      ]
-    }
-  ],
-  "since": -1,
-  "till": 1602796638344
-}
+{"splits":[{"trafficTypeName":"client","name":"workm","trafficAllocation":100,"trafficAllocationSeed":147392224,"seed":524417105,"status":"ACTIVE","killed":false,"defaultTreatment":"on","changeNumber":1602796638344,"algo":2,"configurations":{},"sets":["set_1","set_2"],"conditions":[{"conditionType":"ROLLOUT","matcherGroup":{"combiner":"AND","matchers":[{"keySelector":{"trafficType":"client","attribute":null},"matcherType":"IN_SEGMENT","negate":false,"userDefinedSegmentMatcherData":{"segmentName":"new_segment"},"whitelistMatcherData":null,"unaryNumericMatcherData":null,"betweenMatcherData":null,"booleanMatcherData":null,"dependencyMatcherData":null,"stringMatcherData":null}]},"partitions":[{"treatment":"on","size":0},{"treatment":"off","size":0},{"treatment":"free","size":100},{"treatment":"conta","size":0}],"label":"in segment new_segment"},{"conditionType":"ROLLOUT","matcherGroup":{"combiner":"AND","matchers":[{"keySelector":{"trafficType":"client","attribute":null},"matcherType":"ALL_KEYS","negate":false,"userDefinedSegmentMatcherData":null,"whitelistMatcherData":null,"unaryNumericMatcherData":null,"betweenMatcherData":null,"booleanMatcherData":null,"dependencyMatcherData":null,"stringMatcherData":null}]},"partitions":[{"treatment":"on","size":100},{"treatment":"off","size":0},{"treatment":"free","size":0},{"treatment":"conta","size":0}],"label":"default rule"}]},{"trafficTypeName":"client","name":"workm_set_3","trafficAllocation":100,"trafficAllocationSeed":147392224,"seed":524417105,"status":"ACTIVE","killed":false,"defaultTreatment":"on","changeNumber":1602796638344,"algo":2,"configurations":{},"sets":["set_3"],"conditions":[{"conditionType":"ROLLOUT","matcherGroup":{"combiner":"AND","matchers":[{"keySelector":{"trafficType":"client","attribute":null},"matcherType":"IN_SEGMENT","negate":false,"userDefinedSegmentMatcherData":{"segmentName":"new_segment"},"whitelistMatcherData":null,"unaryNumericMatcherData":null,"betweenMatcherData":null,"booleanMatcherData":null,"dependencyMatcherData":null,"stringMatcherData":null}]},"partitions":[{"treatment":"on","size":0},{"treatment":"off","size":0},{"treatment":"free","size":100},{"treatment":"conta","size":0}],"label":"in segment new_segment"},{"conditionType":"ROLLOUT","matcherGroup":{"combiner":"AND","matchers":[{"keySelector":{"trafficType":"client","attribute":null},"matcherType":"ALL_KEYS","negate":false,"userDefinedSegmentMatcherData":null,"whitelistMatcherData":null,"unaryNumericMatcherData":null,"betweenMatcherData":null,"booleanMatcherData":null,"dependencyMatcherData":null,"stringMatcherData":null}]},"partitions":[{"treatment":"on","size":100},{"treatment":"off","size":0},{"treatment":"free","size":0},{"treatment":"conta","size":0}],"label":"default rule"}]}],"since":-1,"till":1602796638344}