Added extra test situations to #955
Extended fix for #955 to attributes as suggested by @fromage