Use variable in test name, improve diagnostic clarity
Merge commit '3fbcfaf8a4e1acaba1da7c71245be3e95472653e' into HEAD