Small test cleanup (#43831)

Commit

3 years ago

Small test cleanup (#43831) Deconflict some identifiers, make test run properly in Main module.