Fix shadowing warnings in the test suite.

Issue: PLCR-544