Merge "Add unit tests for encryption_types_client"