Variable-name consistencies
Explicitly state in the namespace
Remove duplicate test