Merge "Adds tests create/update port with multiple attributes"