Merge "Adding "attributes" parameter to be covered in Zone's tests."