tests: Cosmetics
tests: Remove shadowing names, clean-up