Bug 30962: (QA follow-up) Rename attribute and simplify tests