diff --git a/.gherkin-lintrc b/.gherkin-lintrc
index 16d3030..36b2d0c 100644
--- a/.gherkin-lintrc
+++ b/.gherkin-lintrc
@@ -50,8 +50,8 @@
     {
       "steps-length": {
         "Background": 3,
-        "Scenario": 15
+        "Scenario": 16
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/README.md b/README.md
index b796465..31691b0 100644
--- a/README.md
+++ b/README.md
@@ -23,11 +23,11 @@ Combined with the _flagd-provider_ for the associated SDK and the flagd-testbed,
 
 Included suites:
 
-[flagd.feature](gherkin/flagd.feature) includes tests relevant to flagd and all flagd providers:
+[evaluation.feature](gherkin/evaluation.feature) includes tests relevant to flagd and all flagd providers:
 * default value (zero-value) handling (some proto3 implementations handle these inconsistently).
 * basic event handling
 
-[flagd-json-evaluator.feature](gherkin/flagd-json-evaluator.feature) includes tests relevant to flagd and in-process providers:
+[targeting.feature](gherkin/targeting.feature) includes tests relevant to flagd and in-process providers:
 * custom JSONLogic operators (`starts_with`, `ends_with`, `fractional`, `sem_ver`)
 * evaluator reuse via `$ref`
 
diff --git a/gherkin/config.feature b/gherkin/config.feature
index 37e1b1c..ae893e4 100644
--- a/gherkin/config.feature
+++ b/gherkin/config.feature
@@ -28,7 +28,7 @@ Feature: Configuration Test
   Scenario Outline: Default Config
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<default>"
-    Examples: Basic
+    Scenarios: Basic
       | option     | type         | default   |
       | resolver   | ResolverType | rpc       |
       | host       | String       | localhost |
@@ -36,19 +36,19 @@ Feature: Configuration Test
       | tls        | Boolean      | false     |
       | deadlineMs | Integer      | 500       |
     @targetURI
-    Examples: Target URI
+    Scenarios: Target URI
       | option    | type   | default |
       | targetUri | String | null    |
     @customCert
-    Examples: Certificates
+    Scenarios: Certificates
       | option   | type   | default |
       | certPath | String | null    |
     @unixsocket
-    Examples: Unixsocket
+    Scenarios: Unixsocket
       | option     | type   | default |
       | socketPath | String | null    |
     @events
-    Examples: Events
+    Scenarios: Events
       | option            | type    | default |
       | streamDeadlineMs  | Integer | 600000  |
       | keepAliveTime     | Long    | 0       |
@@ -56,7 +56,7 @@ Feature: Configuration Test
       | retryBackoffMaxMs | Integer | 120000  |
       | retryGracePeriod  | Integer | 5       |
     @sync
-    Examples: Sync
+    Scenarios: Sync
       | option            | type    | default |
       | streamDeadlineMs  | Integer | 600000  |
       | keepAliveTime     | Long    | 0       |
@@ -65,12 +65,12 @@ Feature: Configuration Test
       | retryGracePeriod  | Integer | 5       |
       | selector          | String  | null    |
     @caching
-    Examples: caching
+    Scenarios: caching
       | option       | type      | default |
       | cache        | CacheType | lru     |
       | maxCacheSize | Integer   | 1000    |
     @offline
-    Examples: offline
+    Scenarios: offline
       | option                | type    | default |
       | offlineFlagSourcePath | String  | null    |
       | offlinePollIntervalMs | Integer | 5000    |
@@ -80,7 +80,7 @@ Feature: Configuration Test
     Given an option "resolver" of type "ResolverType" with value "rpc"
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<default>"
-    Examples:
+    Scenarios:
       | option | type    | default |
       | port   | Integer | 8013    |
 
@@ -89,7 +89,7 @@ Feature: Configuration Test
     Given an option "resolver" of type "ResolverType" with value "in-process"
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<default>"
-    Examples:
+    Scenarios:
       | option | type    | default |
       | port   | Integer | 8015    |
 
@@ -98,7 +98,7 @@ Feature: Configuration Test
     Given an option "<option>" of type "<type>" with value "<value>"
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<value>"
-    Examples:
+    Scenarios:
       | option     | type         | value      |
       | resolver   | ResolverType | in-process |
       | host       | String       | local      |
@@ -106,19 +106,19 @@ Feature: Configuration Test
       | port       | Integer      | 1234       |
       | deadlineMs | Integer      | 123        |
     @targetURI
-    Examples: Target URI
+    Scenarios: Target URI
       | option    | type   | value |
       | targetUri | String | path  |
     @customCert
-    Examples:
+    Scenarios: Custom Certificate
       | option   | type   | value |
       | certPath | String | path  |
     @unixsocket
-    Examples:
+    Scenarios: Unixsocket
       | option     | type   | value |
       | socketPath | String | path  |
     @events
-    Examples:
+    Scenarios: events
       | option            | type    | value  |
       | streamDeadlineMs  | Integer | 500000 |
       | keepAliveTime     | Long    | 5      |
@@ -126,7 +126,7 @@ Feature: Configuration Test
       | retryBackoffMaxMs | Integer | 12000  |
       | retryGracePeriod  | Integer | 10     |
     @sync
-    Examples:
+    Scenarios: sync
       | option            | type    | value    |
       | streamDeadlineMs  | Integer | 500000   |
       | keepAliveTime     | Long    | 5        |
@@ -135,12 +135,12 @@ Feature: Configuration Test
       | retryGracePeriod  | Integer | 10       |
       | selector          | String  | selector |
     @caching
-    Examples:
+    Scenarios: caching
       | option       | type      | value    |
       | cache        | CacheType | disabled |
       | maxCacheSize | Integer   | 1236     |
     @offline
-    Examples:
+    Scenarios: offline
       | option                | type    | value |
       | offlineFlagSourcePath | String  | path  |
       | offlinePollIntervalMs | Integer | 1000  |
@@ -150,7 +150,7 @@ Feature: Configuration Test
     Given an environment variable "<env>" with value "<value>"
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<value>"
-    Examples:
+    Scenarios:
       | option     | env               | type         | value      |
       | resolver   | FLAGD_RESOLVER    | ResolverType | in-process |
       | resolver   | FLAGD_RESOLVER    | ResolverType | IN-PROCESS |
@@ -161,19 +161,19 @@ Feature: Configuration Test
       | port       | FLAGD_PORT        | Integer      | 1234       |
       | deadlineMs | FLAGD_DEADLINE_MS | Integer      | 123        |
     @targetURI
-    Examples: Target URI
+    Scenarios: Target URI
       | option    | env              | type   | value |
       | targetUri | FLAGD_TARGET_URI | String | path  |
     @customCert
-    Examples:
+    Scenarios: Custom Certificates
       | option   | env                    | type   | value |
       | certPath | FLAGD_SERVER_CERT_PATH | String | path  |
     @unixsocket
-    Examples:
+    Scenarios: Unixsocket
       | option     | env               | type   | value |
       | socketPath | FLAGD_SOCKET_PATH | String | path  |
     @events
-    Examples:
+    Scenarios: Events
       | option            | env                        | type    | value  |
       | streamDeadlineMs  | FLAGD_STREAM_DEADLINE_MS   | Integer | 500000 |
       | keepAliveTime     | FLAGD_KEEP_ALIVE_TIME_MS   | Long    | 5      |
@@ -181,7 +181,7 @@ Feature: Configuration Test
       | retryBackoffMaxMs | FLAGD_RETRY_BACKOFF_MAX_MS | Integer | 12000  |
       | retryGracePeriod  | FLAGD_RETRY_GRACE_PERIOD   | Integer | 10     |
     @sync
-    Examples:
+    Scenarios: Sync
       | option            | env                        | type    | value    |
       | streamDeadlineMs  | FLAGD_STREAM_DEADLINE_MS   | Integer | 500000   |
       | keepAliveTime     | FLAGD_KEEP_ALIVE_TIME_MS   | Long    | 5        |
@@ -190,12 +190,12 @@ Feature: Configuration Test
       | retryGracePeriod  | FLAGD_RETRY_GRACE_PERIOD   | Integer | 10       |
       | selector          | FLAGD_SOURCE_SELECTOR      | String  | selector |
     @caching
-    Examples:
+    Scenarios: Caching
       | option       | env                  | type      | value    |
       | cache        | FLAGD_CACHE          | CacheType | disabled |
       | maxCacheSize | FLAGD_MAX_CACHE_SIZE | Integer   | 1236     |
     @offline
-    Examples:
+    Scenarios: Offline
       | option                | env                            | type    | value |
       | offlineFlagSourcePath | FLAGD_OFFLINE_FLAG_SOURCE_PATH | String  | path  |
       | offlinePollIntervalMs | FLAGD_OFFLINE_POLL_MS          | Integer | 1000  |
@@ -206,7 +206,7 @@ Feature: Configuration Test
     And an option "<option>" of type "<type>" with value "<value>"
     When a config was initialized
     Then the option "<option>" of type "<type>" should have the value "<value>"
-    Examples:
+    Scenarios:
       | option     | env               | type         | value      | env-value |
       | resolver   | FLAGD_RESOLVER    | ResolverType | in-process | rpc       |
       | host       | FLAGD_HOST        | String       | local      | l         |
@@ -214,19 +214,19 @@ Feature: Configuration Test
       | port       | FLAGD_PORT        | Integer      | 1234       | 3456      |
       | deadlineMs | FLAGD_DEADLINE_MS | Integer      | 123        | 345       |
     @targetURI
-    Examples: Target URI
+    Scenarios: Target URI
       | option    | env              | type   | value | env-value |
       | targetUri | FLAGD_TARGET_URI | String | path  | fun       |
     @customCert
-    Examples:
+    Scenarios: Custom Certificates
       | option   | env                    | type   | value | env-value |
       | certPath | FLAGD_SERVER_CERT_PATH | String | path  | rpc       |
     @unixsocket
-    Examples:
+    Scenarios: Unixsocket
       | option     | env               | type   | value | env-value |
       | socketPath | FLAGD_SOCKET_PATH | String | path  | rpc       |
     @events
-    Examples:
+    Scenarios: Events
       | option            | env                        | type    | value  | env-value |
       | streamDeadlineMs  | FLAGD_STREAM_DEADLINE_MS   | Integer | 500000 | 400       |
       | keepAliveTime     | FLAGD_KEEP_ALIVE_TIME_MS   | Long    | 5      | 4         |
@@ -234,7 +234,7 @@ Feature: Configuration Test
       | retryBackoffMaxMs | FLAGD_RETRY_BACKOFF_MAX_MS | Integer | 12000  | 4         |
       | retryGracePeriod  | FLAGD_RETRY_GRACE_PERIOD   | Integer | 10     | 4         |
     @sync
-    Examples:
+    Scenarios: Sync
       | option            | env                        | type    | value    | env-value |
       | streamDeadlineMs  | FLAGD_STREAM_DEADLINE_MS   | Integer | 500000   | 400       |
       | keepAliveTime     | FLAGD_KEEP_ALIVE_TIME_MS   | Long    | 5        | 4         |
@@ -243,12 +243,12 @@ Feature: Configuration Test
       | retryGracePeriod  | FLAGD_RETRY_GRACE_PERIOD   | Integer | 10       | 4         |
       | selector          | FLAGD_SOURCE_SELECTOR      | String  | selector | sele      |
     @caching
-    Examples:
+    Scenarios: Caching
       | option       | env                  | type      | value    | env-value |
       | cache        | FLAGD_CACHE          | CacheType | disabled | lru       |
       | maxCacheSize | FLAGD_MAX_CACHE_SIZE | Integer   | 1236     | 2345      |
     @offline
-    Examples:
+    Scenarios: Offline
       | option                | env                            | type    | value | env-value |
       | offlineFlagSourcePath | FLAGD_OFFLINE_FLAG_SOURCE_PATH | String  | path  | lll       |
       | offlinePollIntervalMs | FLAGD_OFFLINE_POLL_MS          | Integer | 1000  | 4         |
diff --git a/gherkin/connection.feature b/gherkin/connection.feature
new file mode 100644
index 0000000..5068610
--- /dev/null
+++ b/gherkin/connection.feature
@@ -0,0 +1,57 @@
+@rpc @in-process
+Feature: flagd provider disconnect and reconnect functionality
+
+  Scenario Outline: Connection
+    Given a <name> flagd provider
+    And a Boolean-flag with key "boolean-flag" and a default value "true"
+    When the flag was evaluated with details
+    Then the resolved details value should be "true"
+
+    Scenarios: Stable
+      | name   |
+      | stable |
+    @targetURI
+    Scenarios: Target URI
+      | name   |
+      | target |
+    @customCert
+    Scenarios: Certificates
+      | name |
+      | ssl  |
+    @unixsocket @os.linux
+    Scenarios: Unixsocket
+      | name   |
+      | socket |
+
+  @reconnect
+  # This test suite tests the reconnection functionality of flagd providers
+  Scenario Outline: Provider reconnection
+    Given a <name> flagd provider
+    And a ready event handler
+    And a error event handler
+    When a ready event was fired
+    When the connection is lost for 4s
+    Then the error event handler should have been executed
+    Then the ready event handler should have been executed
+
+    Scenarios: Stable
+      | name   |
+      | stable |
+    @targetURI
+    Scenarios: Target URI
+      | name   |
+      | socket |
+    @customCert
+    Scenarios: Certificates
+      | name |
+      | ssl  |
+    @unixsocket @os.linux
+    Scenarios: Unixsocket
+      | name   |
+      | socket |
+
+  Scenario: Provider unavailable
+    Given an option "deadlineMs" of type "Integer" with value "1000"
+    And a unavailable flagd provider
+    And a error event handler
+    Then the error event handler should have been executed within 1000ms
diff --git a/gherkin/evaluation.feature b/gherkin/evaluation.feature
new file mode 100644
index 0000000..7083b61
--- /dev/null
+++ b/gherkin/evaluation.feature
@@ -0,0 +1,34 @@
+@rpc @in-process
+Feature: flagd evaluations
+
+  # This test suite contains scenarios to test flagd providers.
+  # It's associated with the flags configured in flags.
+  # It should be used in conjunction with the suites supplied by the OpenFeature specification.
+
+  Background:
+    Given an option "cache" of type "CacheType" with value "disabled"
+    And a stable flagd provider
+
+  Scenario Outline: Resolve values
+    Given a <type>-flag with key "<key>" and a default value "<default>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<resolved_value>"
+
+    Examples:
+      | key          | type    | default | resolved_value |
+      | boolean-flag | Boolean | false   | true           |
+      | string-flag  | String  | bye     | hi             |
+      | integer-flag | Integer | 1       | 10             |
+      | float-flag   | Float   | 0.1     | 0.5            |
+
+  Scenario Outline: Resolves zero value
+    Given a <type>-flag with key "<key>" and a default value "<default>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<resolved_value>"
+
+    Examples:
+      | key               | type    | default | resolved_value |
+      | boolean-zero-flag | Boolean | true    | false          |
+      | string-zero-flag  | String  | hi      |                |
+      | integer-zero-flag | Integer | 1       | 0              |
+      | float-zero-flag   | Float   | 0.1     | 0.0            |
diff --git a/gherkin/events.feature b/gherkin/events.feature
index 28dd023..b9ec581 100644
--- a/gherkin/events.feature
+++ b/gherkin/events.feature
@@ -1,24 +1,44 @@
-@grace
+@rpc @in-process
 Feature: Flagd Provider State Changes
 
   Background:
-    Given a flagd provider is set
+    Given a stable flagd provider
 
   Scenario Outline: Provider events
-    When a <event> handler is added
-    Then the <event> handler must run
+    Given a <event> event handler
+    When the connection is lost for 6s
+    Then the <event> event handler should have been executed
     Examples:
-      | event                          |
-      | PROVIDER_ERROR                 |
-      | PROVIDER_STALE                 |
-      | PROVIDER_READY                 |
+      | event |
+      | error |
+      | ready |
+    @grace
+    Examples:
+      | event |
+      | stale |
 
+  @grace
   Scenario: Provider events chain ready -> stale -> error -> ready
-    When a PROVIDER_READY handler is added
-    Then the PROVIDER_READY handler must run
-    When a PROVIDER_STALE handler is added
-    Then the PROVIDER_STALE handler must run
-    When a PROVIDER_ERROR handler is added
-    Then the PROVIDER_ERROR handler must run
-    When a PROVIDER_READY handler is added
-    Then the PROVIDER_READY handler must run
+    Given a ready event handler
+    And a error event handler
+    And a stale event handler
+    Then the ready event handler should have been executed
+    When the connection is lost for 6s
+    Then the stale event handler should have been executed
+    Then the error event handler should have been executed
+    Then the ready event handler should have been executed
+
+  Scenario: Provider events chain ready  -> error -> ready
+    Given a ready event handler
+    And a error event handler
+    Then the ready event handler should have been executed
+    When the connection is lost for 6s
+    Then the error event handler should have been executed
+    Then the ready event handler should have been executed
+
+  Scenario: Flag change event
+    Given a String-flag with key "changing-flag" and a default value "false"
+    And a change event handler
+    When a change event was fired
+    And the flag was modified
+    Then the flag should be part of the event payload
diff --git a/gherkin/flagd-json-evaluator.feature b/gherkin/flagd-json-evaluator.feature
deleted file mode 100644
index f762912..0000000
--- a/gherkin/flagd-json-evaluator.feature
+++ /dev/null
@@ -1,126 +0,0 @@
-Feature: flagd json evaluation
-
-  # This test suite contains scenarios to test the json-evaluation of flagd and flag-in-process providers.
-  # It's associated with the flags configured in flags/changing-flag.json, flags/zero-flags.json, flags/custom-ops.json and evaluator-refs.json.
-  # It should be used in conjunction with the suites supplied by the OpenFeature specification.
-
-  Background:
-    Given a flagd provider is set
-
-  # evaluator refs
-  Scenario Outline: Evaluator reuse
-    When a string flag with key <key> is evaluated with default value "fallback"
-    And a context containing a key "email", with value "ballmer@macrosoft.com"
-    Then the returned value should be <value>
-    Examples:
-      | key                              | value |
-      | "some-email-targeted-flag"       | "hi"  |
-      | "some-other-email-targeted-flag" | "yes" |
-
-  # custom operators
-  Scenario Outline: Fractional operator
-    When a string flag with key "fractional-flag" is evaluated with default value "fallback"
-    And a context containing a nested property with outer key "user" and inner key "name", with value <name>
-    Then the returned value should be <value>
-    Examples:
-      | name    | value      |
-      | "jack"  | "spades"   |
-      | "queen" | "clubs"    |
-      | "ten"   | "diamonds" |
-      | "nine"  | "hearts"   |
-      | 3       | "diamonds" |
-
-  Scenario Outline: Fractional operator shorthand
-    When a string flag with key "fractional-flag-shorthand" is evaluated with default value "fallback"
-    And a context containing a targeting key with value <targeting key>
-    Then the returned value should be <value>
-    Examples:
-      | targeting key      | value   |
-      | "jon@company.com"  | "heads" |
-      | "jane@company.com" | "tails" |
-
-  Scenario Outline: Fractional operator with shared seed
-    When a string flag with key "fractional-flag-A-shared-seed" is evaluated with default value "fallback"
-    And a context containing a nested property with outer key "user" and inner key "name", with value <name>
-    Then the returned value should be <value>
-    Examples:
-      | name    | value      |
-      | "jack"  | "hearts"   |
-      | "queen" | "spades"   |
-      | "ten"   | "hearts"   |
-      | "nine"  | "diamonds" |
-
-  Scenario Outline: Second fractional operator with shared seed
-    When a string flag with key "fractional-flag-B-shared-seed" is evaluated with default value "fallback"
-    And a context containing a nested property with outer key "user" and inner key "name", with value <name>
-    Then the returned value should be <value>
-    Examples:
-      | name    | value             |
-      | "jack"  | "ace-of-hearts"   |
-      | "queen" | "ace-of-spades"   |
-      | "ten"   | "ace-of-hearts"   |
-      | "nine"  | "ace-of-diamonds" |
-
-  Scenario Outline: Substring operators
-    When a string flag with key "starts-ends-flag" is evaluated with default value "fallback"
-    And a context containing a key "id", with value <id>
-    Then the returned value should be <value>
-    Examples:
-      | id       | value     |
-      | "abcdef" | "prefix"  |
-      | "uvwxyz" | "postfix" |
-      | "abcxyz" | "prefix"  |
-      | "lmnopq" | "none"    |
-      | 3        | "none"    |
-
-  Scenario Outline: Semantic version operator numeric comparison
-    When a string flag with key "equal-greater-lesser-version-flag" is evaluated with default value "fallback"
-    And a context containing a key "version", with value <version>
-    Then the returned value should be <value>
-    Examples:
-      | version       | value     |
-      | "2.0.0"       | "equal"   |
-      | "2.1.0"       | "greater" |
-      | "1.9.0"       | "lesser"  |
-      | "2.0.0-alpha" | "lesser"  |
-      | "2.0.0.0"     | "none"    |
-
-  Scenario Outline: Semantic version operator semantic comparison
-    When a string flag with key "major-minor-version-flag" is evaluated with default value "fallback"
-    And a context containing a key "version", with value <version>
-    Then the returned value should be <value>
-    Examples:
-      | version | value   |
-      | "3.0.1" | "minor" |
-      | "3.1.0" | "major" |
-      | "4.0.0" | "none"  |
-
-  Scenario Outline: Time-based operations
-    When an integer flag with key "timestamp-flag" is evaluated with default value 0
-    And a context containing a key "time", with value <time>
-    Then the returned value should be <value>
-    Examples:
-      | time       | value |
-      | 1          | -1    |
-      | 4133980802 | 1     |
-
-  Scenario Outline: Targeting by targeting key
-    When a string flag with key "targeting-key-flag" is evaluated with default value "fallback"
-    And a context containing a targeting key with value <targeting key>
-    Then the returned value should be <value>
-    Then the returned reason should be <reason>
-    Examples:
-      | targeting key                          | value  | reason            |
-      | "5c3d8535-f81a-4478-a6d3-afaa4d51199e" | "hit"  | "TARGETING_MATCH" |
-      | "f20bd32d-703b-48b6-bc8e-79d53c85134a" | "miss" | "DEFAULT"         |
-
-  Scenario Outline: Errors and edge cases
-    When an integer flag with key <key> is evaluated with default value 3
-    Then the returned value should be <value>
-    Examples:
-      | key                                 | value |
-      | "targeting-null-variant-flag"       | 2     |
-      | "error-targeting-flag"              | 3     |
-      | "missing-variant-targeting-flag"    | 3     |
-      | "non-string-variant-targeting-flag" | 2     |
-      | "empty-targeting-flag"              | 1     |
diff --git a/gherkin/flagd-reconnect.feature b/gherkin/flagd-reconnect.feature
deleted file mode 100644
index 463d2bd..0000000
--- a/gherkin/flagd-reconnect.feature
+++ /dev/null
@@ -1,15 +0,0 @@
-Feature: flagd provider disconnect and reconnect functionality
-
-  # This test suite tests the reconnection functionality of flagd providers
-
-  Scenario: Provider reconnection
-    Given a flagd provider is set
-    When a PROVIDER_READY handler and a PROVIDER_ERROR handler are added
-    Then the PROVIDER_READY handler must run when the provider connects
-    And the PROVIDER_ERROR handler must run when the provider's connection is lost
-    And when the connection is reestablished the PROVIDER_READY handler must run again
-
-  Scenario: Provider unavailable
-    Given flagd is unavailable
-    When a flagd provider is set and initialization is awaited
-    Then an error should be indicated within the configured deadline
diff --git a/gherkin/flagd-rpc-caching.feature b/gherkin/flagd-rpc-caching.feature
deleted file mode 100644
index d2aeaea..0000000
--- a/gherkin/flagd-rpc-caching.feature
+++ /dev/null
@@ -1,44 +0,0 @@
-Feature: Flag evaluation with Caching
-
-# This test suite contains scenarios to test the flag evaluation API with caching (RPC only)
-
-  Background:
-    Given a provider is registered
-
-  Scenario: Resolves boolean details with caching
-    When a boolean flag with key "boolean-flag" is evaluated with details and default value "false"
-    Then the resolved boolean details value should be "true", the variant should be "on", and the reason should be "STATIC"
-    Then the resolved boolean details value should be "true", the variant should be "on", and the reason should be "CACHED"
-
-  Scenario: Resolves string details with caching
-    When a string flag with key "string-flag" is evaluated with details and default value "bye"
-    Then the resolved string details value should be "hi", the variant should be "greeting", and the reason should be "STATIC"
-    Then the resolved string details value should be "hi", the variant should be "greeting", and the reason should be "CACHED"
-
-  Scenario: Resolves integer details with caching
-    When an integer flag with key "integer-flag" is evaluated with details and default value 1
-    Then the resolved integer details value should be 10, the variant should be "ten", and the reason should be "STATIC"
-    Then the resolved integer details value should be 10, the variant should be "ten", and the reason should be "CACHED"
-
-  Scenario: Resolves float details with caching
-    When a float flag with key "float-flag" is evaluated with details and default value 0.1
-    Then the resolved float details value should be 0.5, the variant should be "half", and the reason should be "STATIC"
-    Then the resolved float details value should be 0.5, the variant should be "half", and the reason should be "CACHED"
-
-  Scenario: Resolves object details with caching
-    When an object flag with key "object-flag" is evaluated with details and a null default value
-    Then the resolved object details value should be contain fields "showImages", "title", and "imagesPerPage", with values "true", "Check out these pics!" and 100, respectively
-    And the variant should be "template", and the reason should be "STATIC"
-    Then the resolved object details value should be contain fields "showImages", "title", and "imagesPerPage", with values "true", "Check out these pics!" and 100, respectively
-    And the variant should be "template", and the reason should be "CACHED"
-
-  Scenario: Flag change event with caching
-    When a string flag with key "changing-flag" is evaluated with details
-    When a PROVIDER_CONFIGURATION_CHANGED handler is added
-    And a flag with key "changing-flag" is modified
-    Then the returned reason should be "STATIC"
-    Then the returned reason should be "CACHED"
-    Then the PROVIDER_CONFIGURATION_CHANGED handler must run
-    And the event details must indicate "changing-flag" was altered
-    Then the returned reason should be "STATIC"
-    Then the returned reason should be "CACHED"
diff --git a/gherkin/flagd.feature b/gherkin/flagd.feature
deleted file mode 100644
index 85490bd..0000000
--- a/gherkin/flagd.feature
+++ /dev/null
@@ -1,36 +0,0 @@
-Feature: flagd providers
-
-  # This test suite contains scenarios to test flagd providers.
-  # It's associated with the flags configured in flags/changing-flag.json and flags/zero-flags.json.
-  # It should be used in conjunction with the suites supplied by the OpenFeature specification.
-
-  Background:
-    Given a flagd provider is set
-
-  # events
-  Scenario: Provider ready event
-    When a PROVIDER_READY handler is added
-    Then the PROVIDER_READY handler must run
-
-  Scenario: Flag change event
-    When a PROVIDER_CONFIGURATION_CHANGED handler is added
-    And a flag with key "changing-flag" is modified
-    Then the PROVIDER_CONFIGURATION_CHANGED handler must run
-    And the event details must indicate "changing-flag" was altered
-
-  # zero evaluation
-  Scenario: Resolves boolean zero value
-    When a zero-value boolean flag with key "boolean-zero-flag" is evaluated with default value "true"
-    Then the resolved boolean zero-value should be "false"
-
-  Scenario: Resolves string zero value
-    When a zero-value string flag with key "string-zero-flag" is evaluated with default value "hi"
-    Then the resolved string zero-value should be ""
-
-  Scenario: Resolves integer zero value
-    When a zero-value integer flag with key "integer-zero-flag" is evaluated with default value 1
-    Then the resolved integer zero-value should be 0
-
-  Scenario: Resolves float zero value
-    When a zero-value float flag with key "float-zero-flag" is evaluated with default value 0.1
-    Then the resolved float zero-value should be 0.0
diff --git a/gherkin/offline.feature b/gherkin/offline.feature
new file mode 100644
index 0000000..db2c970
--- /dev/null
+++ b/gherkin/offline.feature
@@ -0,0 +1,28 @@
+@in-process @offline
+Feature: in-process offline file functionality
+
+  Background:
+    Given a offline flagd provider
+
+  Scenario Outline: Resolve offline values
+    Given a <type>-flag with key "<key>" and a default value "<default>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<resolved_value>"
+    Examples:
+      | key          | type    | default | resolved_value |
+      | boolean-flag | Boolean | false   | true           |
+      | string-flag  | String  | bye     | hi             |
+      | integer-flag | Integer | 1       | 10             |
+      | float-flag   | Float   | 0.1     | 0.5            |
+
+  Scenario Outline: Resolves offline zero values
+    Given a <type>-flag with key "<key>" and a default value "<default>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<resolved_value>"
+
+    Examples:
+      | key               | type    | default | resolved_value |
+      | boolean-zero-flag | Boolean | true    | false          |
+      | string-zero-flag  | String  | hi      |                |
+      | integer-zero-flag | Integer | 1       | 0              |
+      | float-zero-flag   | Float   | 0.1     | 0.0            |
diff --git a/gherkin/rpc-caching.feature b/gherkin/rpc-caching.feature
new file mode 100644
index 0000000..28debe5
--- /dev/null
+++ b/gherkin/rpc-caching.feature
@@ -0,0 +1,60 @@
+@rpc @caching
+Feature: Flag evaluation with Caching
+
+# This test suite contains scenarios to test the flag evaluation API with caching (RPC only)
+  Background:
+    Given an option "cache" of type "CacheType" with value "lru"
+    And a stable flagd provider
+
+  Scenario Outline: Resolves <type> details with caching
+    Given a <type>-flag with key "<key>" and a default value "<default>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<resolved_value>"
+    And the variant should be "<resolved_variant>"
+    And the reason should be "STATIC"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<resolved_value>"
+    And the variant should be "<resolved_variant>"
+    And the reason should be "CACHED"
+
+    Examples:
+      | key          | type    | default | resolved_variant | resolved_value                                                                |
+      | boolean-flag | Boolean | false   | on               | true                                                                          |
+      | string-flag  | String  | bye     | greeting         | hi                                                                            |
+      | integer-flag | Integer | 1       | ten              | 10                                                                            |
+      | float-flag   | Float   | 0.1     | half             | 0.5                                                                           |
+      | object-flag  | Object  | null    | template         | {"showImages": true, "title": "Check out these pics!", "imagesPerPage": 100 } |
+
+  Scenario: Flag change event with caching
+    Given a String-flag with key "changing-flag" and a default value "false"
+    And a change event handler
+    When a change event was fired
+    And the flag was modified
+    And the flag was evaluated with details
+    Then the reason should be "STATIC"
+    When the flag was evaluated with details
+    Then the reason should be "CACHED"
+    When a change event was fired
+    And the flag was modified
+    And the flag was evaluated with details
+    Then the reason should be "STATIC"
+    When the flag was evaluated with details
+    Then the reason should be "CACHED"
+
+  Scenario: Stale and Error stage
+    Given a ready event handler
+    And a stale event handler
+    And a error event handler
+    And a String-flag with key "changing-flag" and a default value "false"
+    When the flag was evaluated with details
+    Then the reason should be "STATIC"
+    When the flag was evaluated with details
+    Then the reason should be "CACHED"
+    When the connection is lost for 6s
+    And a stale event was fired
+    And the flag was evaluated with details
+    Then the reason should be "CACHED"
+    When a error event was fired
+    And a ready event was fired
+    And the flag was evaluated with details
+    Then the reason should be "STATIC"
diff --git a/gherkin/targeting.feature b/gherkin/targeting.feature
new file mode 100644
index 0000000..b6ffb35
--- /dev/null
+++ b/gherkin/targeting.feature
@@ -0,0 +1,146 @@
+@rpc @in-process @targeting
+Feature: Targeting rules
+
+  # This test suite contains scenarios to test the json-evaluation of flagd and flag-in-process providers.
+  # It's associated with the flags configured in flags/changing-flag.json, flags/zero-flags.json, flags/custom-ops.json and evaluator-refs.json.
+  # It should be used in conjunction with the suites supplied by the OpenFeature specification.
+
+  Background:
+    Given an option "cache" of type "CacheType" with value "disabled"
+    And a stable flagd provider
+
+  # evaluator refs
+  Scenario Outline: Evaluator reuse
+    Given a String-flag with key "<key>" and a default value "fallback"
+    And a context containing a key "email", with type "String" and with value "ballmer@macrosoft.com"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Examples:
+      | key                            | value |
+      | some-email-targeted-flag       | hi    |
+      | some-other-email-targeted-flag | yes   |
+
+  # custom operators
+  @fractional
+  Scenario Outline: Fractional operator
+    Given a String-flag with key "fractional-flag" and a default value "fallback"
+    And a context containing a nested property with outer key "user" and inner key "name", with value "<name>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Examples:
+      | name  | value    |
+      | jack  | spades   |
+      | queen | clubs    |
+      | ten   | diamonds |
+      | nine  | hearts   |
+      | 3     | diamonds |
+
+  @fractional
+  Scenario Outline: Fractional operator shorthand
+    Given a String-flag with key "fractional-flag-shorthand" and a default value "fallback"
+    And a context containing a targeting key with value "<targeting key>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Examples:
+      | targeting key    | value |
+      | jon@company.com  | heads |
+      | jane@company.com | tails |
+
+  @fractional
+  Scenario Outline: Fractional operator with shared seed
+    Given a String-flag with key "fractional-flag-A-shared-seed" and a default value "fallback"
+    And a context containing a nested property with outer key "user" and inner key "name", with value "<name>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Examples:
+      | name  | value    |
+      | jack  | hearts   |
+      | queen | spades   |
+      | ten   | hearts   |
+      | nine  | diamonds |
+
+  @fractional
+  Scenario Outline: Second fractional operator with shared seed
+    Given a String-flag with key "fractional-flag-B-shared-seed" and a default value "fallback"
+    And a context containing a nested property with outer key "user" and inner key "name", with value "<name>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Examples:
+      | name  | value           |
+      | jack  | ace-of-hearts   |
+      | queen | ace-of-spades   |
+      | ten   | ace-of-hearts   |
+      | nine  | ace-of-diamonds |
+
+  @string
+  Scenario Outline: Substring operators
+    Given a String-flag with key "starts-ends-flag" and a default value "fallback"
+    And a context containing a key "id", with type "String" and with value "<id>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Examples:
+      | id     | value   |
+      | abcdef | prefix  |
+      | uvwxyz | postfix |
+      | abcxyz | prefix  |
+      | lmnopq | none    |
+      | 3      | none    |
+
+  @semver
+  Scenario Outline: Semantic version operator numeric comparison
+    Given a String-flag with key "equal-greater-lesser-version-flag" and a default value "fallback"
+    And a context containing a key "version", with type "String" and with value "<version>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Examples:
+      | version     | value   |
+      | 2.0.0       | equal   |
+      | 2.1.0       | greater |
+      | 1.9.0       | lesser  |
+      | 2.0.0-alpha | lesser  |
+      | 2.0.0.0     | none    |
+
+  @semver
+  Scenario Outline: Semantic version operator semantic comparison
+    Given a String-flag with key "major-minor-version-flag" and a default value "fallback"
+    And a context containing a key "version", with type "String" and with value "<version>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Examples:
+      | version | value |
+      | 3.0.1   | minor |
+      | 3.1.0   | major |
+      | 4.0.0   | none  |
+
+  Scenario Outline: Time-based operations
+    Given a Integer-flag with key "timestamp-flag" and a default value "0"
+    And a context containing a key "time", with type "Integer" and with value "<time>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Examples:
+      | time       | value |
+      | 1          | -1    |
+      | 4133980802 | 1     |
+
+  Scenario Outline: Targeting by targeting key
+    Given a String-flag with key "targeting-key-flag" and a default value "fallback"
+    And a context containing a targeting key with value "<targeting key>"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Then the reason should be "<reason>"
+    Examples:
+      | targeting key                        | value | reason          |
+      | 5c3d8535-f81a-4478-a6d3-afaa4d51199e | hit   | TARGETING_MATCH |
+      | f20bd32d-703b-48b6-bc8e-79d53c85134a | miss  | DEFAULT         |
+
+  Scenario Outline: Errors and edge cases
+    Given a Integer-flag with key "<key>" and a default value "3"
+    When the flag was evaluated with details
+    Then the resolved details value should be "<value>"
+    Examples:
+      | key                                | value |
+      | targeting-null-variant-flag       | 2     |
+      | error-targeting-flag              | 3     |
+      | missing-variant-targeting-flag    | 3     |
+      | non-string-variant-targeting-flag | 2     |
+      | empty-targeting-flag              | 1     |
diff --git a/release-please-config.json b/release-please-config.json
index 1b900a0..a284d0a 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -2,7 +2,8 @@
   "bootstrap-sha": "cb6c1dc1a32e0f5383e5119c0d8389000750f511",
   "packages": {
     ".": {
-      "release-type": "simple",
+      "release-type": "as-release",
+      "release-as": "1.0.0",
       "prerelease": false,
       "bump-minor-pre-major": true,
       "bump-patch-for-minor-pre-major": true