CHANGEd to use data-role instead of string compares for spec tests where possible