Merge "Add tests for encryption_key_ref"