restyled / renamed vars in last patch
[git-p4: depot-paths = "//src/minitest/dev/": change = 9697]
Added extra test to describe last bug
[git-p4: depot-paths = "//src/minitest/dev/": change = 9698]