Adding tests for keyvalue def and structured def