Could you move the key and value into the data provider as well? This way we can test with multiple versions in the future.