Bug 29809: (follow-up) Update tests and rename variable